summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'security/openssh/patches/patch-ac')
-rw-r--r--security/openssh/patches/patch-ac33
1 files changed, 30 insertions, 3 deletions
diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-ac
index 6c5f5618715..da61f89b83d 100644
--- a/security/openssh/patches/patch-ac
+++ b/security/openssh/patches/patch-ac
@@ -1,8 +1,35 @@
-$NetBSD: patch-ac,v 1.11 2004/08/31 11:27:12 wiz Exp $
+$NetBSD: patch-ac,v 1.12 2005/03/07 23:29:49 tv Exp $
---- defines.h.orig 2004-06-22 05:27:16.000000000 +0200
+--- defines.h.orig 2004-06-21 23:27:16.000000000 -0400
+++ defines.h
-@@ -591,6 +591,24 @@ struct winsize {
+@@ -30,6 +30,15 @@
+
+ /* Constants */
+
++#ifdef HAVE_INTERIX
++/* Interix has a special concept of "administrator". */
++# define ROOTUID 197108
++# define ROOTGID 131616
++#else
++# define ROOTUID 0
++# define ROOTGID 0
++#endif
++
+ #ifndef SHUT_RDWR
+ enum
+ {
+@@ -424,8 +433,8 @@ struct winsize {
+ # define __attribute__(x)
+ #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
+
+-#ifndef __dead
+-# define __dead __attribute__((noreturn))
++#ifndef __noreturn
++# define __noreturn __attribute__((noreturn))
+ #endif
+
+ /* *-*-nto-qnx doesn't define this macro in the system headers */
+@@ -591,6 +600,24 @@ struct winsize {
# endif
# endif
#endif