summaryrefslogtreecommitdiffstats
path: root/openbsd-compat
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-03-09 06:36:55 +0100
committerDarren Tucker <dtucker@zip.com.au>2008-03-09 06:36:55 +0100
commit16ba6a8ea25ee45feec55ce5a29a4723c2665ea2 (patch)
treee1236b06ced64159bba370f3831eb52643cd1ea3 /openbsd-compat
parent - (dtucker) [configure.ac] It turns out gcc's -fstack-protector-all doesn't (diff)
downloadopenssh-16ba6a8ea25ee45feec55ce5a29a4723c2665ea2.tar.xz
openssh-16ba6a8ea25ee45feec55ce5a29a4723c2665ea2.zip
- (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.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/port-aix.c11
-rw-r--r--openbsd-compat/port-aix.h4
2 files changed, 1 insertions, 14 deletions
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index b19d2296e..5b1cb7387 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 14024d417..ecb9feae8 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 */