summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/port-aix.c11
-rw-r--r--openbsd-compat/port-aix.h4
3 files changed, 5 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 14b212eb2..ce8b52e65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (dtucker) [configure.ac] It turns out gcc's -fstack-protector-all doesn't 2 - (dtucker) [configure.ac] It turns out gcc's -fstack-protector-all doesn't
3 always work for all platforms and versions, so test what we can and 3 always work for all platforms and versions, so test what we can and
4 add a configure flag to turn it of if needed. ok djm@ 4 add a configure flag to turn it of if needed. ok djm@
5 - (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups
6 implementation. It's not needed to fix bug #1081 and breaks the build
7 on some AIX configurations.
5 8
620080307 920080307
7 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
@@ -3703,4 +3706,4 @@
3703 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3706 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3704 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3707 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3705 3708
3706$Id: ChangeLog,v 1.4861 2008/03/09 00:34:23 dtucker Exp $ 3709$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 b19d2296e..5b1cb7387 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -435,17 +435,6 @@ out:
435 *grpcnt = ngroups; 435 *grpcnt = ngroups;
436 return ret; 436 return ret;
437} 437}
438
439int
440ssh_initgroups(const char *user, gid_t group)
441{
442 gid_t grps[NGROUPS_MAX];
443 int grpcnt = NGROUPS_MAX;
444
445 if (getgrouplist(user, group, grps, &grpcnt) == -1)
446 return -1;
447 return setgroups(grpcnt, grps);
448}
449# endif /* USE_GETGRSET */ 438# endif /* USE_GETGRSET */
450 439
451#endif /* _AIX */ 440#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 @@
1/* $Id: port-aix.h,v 1.28 2008/02/28 12:16:04 dtucker Exp $ */ 1/* $Id: port-aix.h,v 1.29 2008/03/09 05:36:55 dtucker Exp $ */
2 2
3/* 3/*
4 * 4 *
@@ -111,8 +111,6 @@ int sshaix_getnameinfo(const struct sockaddr *, size_t, char *, size_t,
111# define HAVE_GETGROUPLIST 111# define HAVE_GETGROUPLIST
112# define USE_GETGRSET 112# define USE_GETGRSET
113int getgrouplist(const char *, gid_t, gid_t *, int *); 113int getgrouplist(const char *, gid_t, gid_t *, int *);
114int ssh_initgroups(const char *, gid_t);
115# define initgroups(a, b) ssh_initgroups((a), (b))
116#endif 114#endif
117 115
118#endif /* _AIX */ 116#endif /* _AIX */