diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-03-09 16:36:55 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-03-09 16:36:55 +1100 |
| commit | 16ba6a8ea25ee45feec55ce5a29a4723c2665ea2 (patch) | |
| tree | e1236b06ced64159bba370f3831eb52643cd1ea3 | |
| parent | b7918afddf36c22b8eb87d98819d2cf9ddb6b424 (diff) | |
- (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups
implementation. It's not needed to fix bug #1081 and breaks the build
on some AIX configurations.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | openbsd-compat/port-aix.c | 11 | ||||
| -rw-r--r-- | openbsd-compat/port-aix.h | 4 |
3 files changed, 5 insertions, 15 deletions
@@ -2,6 +2,9 @@ - (dtucker) [configure.ac] It turns out gcc's -fstack-protector-all doesn't always work for all platforms and versions, so test what we can and add a configure flag to turn it of if needed. ok djm@ + - (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups + implementation. It's not needed to fix bug #1081 and breaks the build + on some AIX configurations. 20080307 - (djm) OpenBSD CVS Sync @@ -3703,4 +3706,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4861 2008/03/09 00:34:23 dtucker Exp $ +$Id: ChangeLog,v 1.4862 2008/03/09 05:36:55 dtucker Exp $ diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index b19d2296..5b1cb738 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c @@ -435,17 +435,6 @@ out: *grpcnt = ngroups; return ret; } - -int -ssh_initgroups(const char *user, gid_t group) -{ - gid_t grps[NGROUPS_MAX]; - int grpcnt = NGROUPS_MAX; - - if (getgrouplist(user, group, grps, &grpcnt) == -1) - return -1; - return setgroups(grpcnt, grps); -} # endif /* USE_GETGRSET */ #endif /* _AIX */ diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 14024d41..ecb9feae 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -1,4 +1,4 @@ -/* $Id: port-aix.h,v 1.28 2008/02/28 12:16:04 dtucker Exp $ */ +/* $Id: port-aix.h,v 1.29 2008/03/09 05:36:55 dtucker Exp $ */ /* * @@ -111,8 +111,6 @@ int sshaix_getnameinfo(const struct sockaddr *, size_t, char *, size_t, # define HAVE_GETGROUPLIST # define USE_GETGRSET int getgrouplist(const char *, gid_t, gid_t *, int *); -int ssh_initgroups(const char *, gid_t); -# define initgroups(a, b) ssh_initgroups((a), (b)) #endif #endif /* _AIX */ |