summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-ac
blob: 0132349bb2e0f3cb9a12c5b3183ff91825282db5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
$NetBSD: patch-ac,v 1.13 2005/09/21 18:07:09 reed Exp $

--- defines.h.orig	2005-08-31 11:59:49.000000000 -0500
+++ defines.h
@@ -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
 {
@@ -442,8 +451,8 @@
 # define __attribute__(x)
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
-#ifndef __dead
-# define __dead	__attribute__((noreturn))
+#ifndef __noreturn
+# define __noreturn __attribute__((noreturn))
 #endif
 
 #if !defined(HAVE_ATTRIBUTE__SENTINEL__) && !defined(__sentinel__)
@@ -635,6 +644,24 @@
 #    endif
 #  endif
 #endif
+#ifndef UTMPX_FILE
+#  ifdef _PATH_UTMPX
+#    define UTMPX_FILE _PATH_UTMPX
+#  else
+#    ifdef CONF_UTMPX_FILE
+#      define UTMPX_FILE CONF_UTMPX_FILE
+#    endif
+#  endif
+#endif
+#ifndef WTMPX_FILE
+#  ifdef _PATH_WTMPX
+#    define WTMPX_FILE _PATH_WTMPX
+#  else
+#    ifdef CONF_WTMPX_FILE
+#      define WTMPX_FILE CONF_WTMPX_FILE
+#    endif
+#  endif
+#endif
 /* pick up the user's location for lastlog if given */
 #ifndef LASTLOG_FILE
 #  ifdef _PATH_LASTLOG