- (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.

diff --git a/ChangeLog b/ChangeLog
index 549ef8029e94832b6dc732999d7fa9e5710de65c..3c44a2aabc1c42864ededa936553683667245c1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index b19d2296e74ec3fbea2d9ed0b2b0e2745a5858ae..5b1cb73874dd51d38906d2ea848b0bf76ee3dedc 100644 (file)
--- 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 cd1c2c2ec5b311b44724f14226e44c3bc111fa19..147ad0b35aefed289f29671b00f92ea85d10c6f5 100644 (file)
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -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 */