diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.c | 13 | ||||
-rw-r--r-- | openbsd-compat/bsd-misc.h | 6 |
5 files changed, 8 insertions, 24 deletions
@@ -1,6 +1,9 @@ | |||
1 | 20050226 | 1 | 20050226 |
2 | - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] | 2 | - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c] |
3 | Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. | 3 | Remove two obsolete Cygwin #ifdefs. Patch from vinschen at redhat.com. |
4 | - (dtucker) [acconfig.h configure.ac openbsd-compat/bsd-misc.{c,h}] | ||
5 | Remove SETGROUPS_NOOP, was only used by Cygwin, which doesn't need it any | ||
6 | more. Patch from vinschen at redhat.com. | ||
4 | 7 | ||
5 | 20050224 | 8 | 20050224 |
6 | - (djm) [configure.ac] in_addr_t test needs sys/types.h too | 9 | - (djm) [configure.ac] in_addr_t test needs sys/types.h too |
@@ -2167,4 +2170,4 @@ | |||
2167 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2170 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2168 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2171 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2169 | 2172 | ||
2170 | $Id: ChangeLog,v 1.3664 2005/02/25 23:04:28 dtucker Exp $ | 2173 | $Id: ChangeLog,v 1.3665 2005/02/25 23:07:37 dtucker Exp $ |
diff --git a/acconfig.h b/acconfig.h index 014413505..5721f65fb 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.180 2004/08/16 13:12:06 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.181 2005/02/25 23:07:38 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -52,9 +52,6 @@ | |||
52 | #undef SPT_TYPE | 52 | #undef SPT_TYPE |
53 | #undef SPT_PADCHAR | 53 | #undef SPT_PADCHAR |
54 | 54 | ||
55 | /* setgroups() NOOP allowed */ | ||
56 | #undef SETGROUPS_NOOP | ||
57 | |||
58 | /* SCO workaround */ | 55 | /* SCO workaround */ |
59 | #undef BROKEN_SYS_TERMIO_H | 56 | #undef BROKEN_SYS_TERMIO_H |
60 | 57 | ||
diff --git a/configure.ac b/configure.ac index fae62d609..94d127299 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.247 2005/02/24 01:12:35 djm Exp $ | 1 | # $Id: configure.ac,v 1.248 2005/02/25 23:07:38 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -158,7 +158,6 @@ case "$host" in | |||
158 | AC_DEFINE(NO_X11_UNIX_SOCKETS) | 158 | AC_DEFINE(NO_X11_UNIX_SOCKETS) |
159 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) | 159 | AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT) |
160 | AC_DEFINE(DISABLE_FD_PASSING) | 160 | AC_DEFINE(DISABLE_FD_PASSING) |
161 | AC_DEFINE(SETGROUPS_NOOP) | ||
162 | ;; | 161 | ;; |
163 | *-*-dgux*) | 162 | *-*-dgux*) |
164 | AC_DEFINE(IP_TOS_IS_BROKEN) | 163 | AC_DEFINE(IP_TOS_IS_BROKEN) |
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index 1b276b4f4..41f92cce9 100644 --- a/openbsd-compat/bsd-misc.c +++ b/openbsd-compat/bsd-misc.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | 20 | ||
21 | RCSID("$Id: bsd-misc.c,v 1.25 2004/08/15 08:41:00 djm Exp $"); | 21 | RCSID("$Id: bsd-misc.c,v 1.26 2005/02/25 23:07:38 dtucker Exp $"); |
22 | 22 | ||
23 | #ifndef HAVE___PROGNAME | 23 | #ifndef HAVE___PROGNAME |
24 | char *__progname; | 24 | char *__progname; |
@@ -122,17 +122,6 @@ int truncate(const char *path, off_t length) | |||
122 | } | 122 | } |
123 | #endif /* HAVE_TRUNCATE */ | 123 | #endif /* HAVE_TRUNCATE */ |
124 | 124 | ||
125 | #if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP) | ||
126 | /* | ||
127 | * Cygwin setgroups should be a noop. | ||
128 | */ | ||
129 | int | ||
130 | setgroups(size_t size, const gid_t *list) | ||
131 | { | ||
132 | return (0); | ||
133 | } | ||
134 | #endif | ||
135 | |||
136 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) | 125 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) |
137 | int nanosleep(const struct timespec *req, struct timespec *rem) | 126 | int nanosleep(const struct timespec *req, struct timespec *rem) |
138 | { | 127 | { |
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h index 33a1d707f..b61ec4244 100644 --- a/openbsd-compat/bsd-misc.h +++ b/openbsd-compat/bsd-misc.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-misc.h,v 1.17 2004/08/15 08:41:00 djm Exp $ */ | 1 | /* $Id: bsd-misc.h,v 1.18 2005/02/25 23:07:38 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> | 4 | * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org> |
@@ -67,10 +67,6 @@ int utimes(char *, struct timeval *); | |||
67 | int truncate (const char *, off_t); | 67 | int truncate (const char *, off_t); |
68 | #endif /* HAVE_TRUNCATE */ | 68 | #endif /* HAVE_TRUNCATE */ |
69 | 69 | ||
70 | #if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP) | ||
71 | int setgroups(size_t, const gid_t *); | ||
72 | #endif | ||
73 | |||
74 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) | 70 | #if !defined(HAVE_NANOSLEEP) && !defined(HAVE_NSLEEP) |
75 | #ifndef HAVE_STRUCT_TIMESPEC | 71 | #ifndef HAVE_STRUCT_TIMESPEC |
76 | struct timespec { | 72 | struct timespec { |