X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fslocal.c;h=b665280bbb32717bea0aced2629e262e0085706a;hb=8146bc09fc2e8ad69520ba998be51fb02cbf069c;hp=dce966387afdc7571c24c470846b0682b469ebb9;hpb=411195e89109d7b1c0a0d552d1644837be781eeb;p=mmh

diff --git a/uip/slocal.c b/uip/slocal.c
index dce9663..b665280 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -28,7 +28,15 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <grp.h>
+
+#include <grp.h>     /* initgroups() is here on Solaris 2.6 */
+#include <unistd.h>  /* initgroups() is here on HP-UX 10.20 */
+
+/* On AIX 4.1, initgroups() is defined and even documented (giving the parameter
+   types as "char*" and "int"), but doesn't have a prototype in any of the
+   system header files.  On other OSes, this should be a duplicate prototype
+   that won't cause any errors or warnings. */
+extern int  initgroups(const char*, gid_t);
 
 #ifdef HAVE_DB1_NDBM_H
 #include <db1/ndbm.h>
@@ -38,8 +46,6 @@
 
 #include <utmp.h>
 
-extern int  initgroups(char*, int);  /* def'd in libc.a but no .h on AIX 4.1 */
-
 #ifndef UTMP_FILE
 # ifdef _PATH_UTMP
 #  define UTMP_FILE _PATH_UTMP
@@ -78,7 +84,7 @@ static struct swit switches[] = {
 #define VERSIONSW     13
     { "version", 0 },
 #define	HELPSW        14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };