BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / initgroups.c

diff --git a/usr/src/lib/libc/gen/initgroups.c b/usr/src/lib/libc/gen/initgroups.c
index b43842f..798798e 100644 (file)
--- a/usr/src/lib/libc/gen/initgroups.c
+++ b/usr/src/lib/libc/gen/initgroups.c
@@ -1,38 +1,87 @@
-/*     initgroups.c    4.2     83/02/15        */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)initgroups.c       5.7 (Berkeley) 2/23/91";
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * initgroups
  */
 
 /*
  * initgroups
  */

-#include <stdio.h>

 #include <sys/param.h>
 #include <sys/param.h>

+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>

 #include <grp.h>
 
 struct group *getgrent();
 
 #include <grp.h>
 
 struct group *getgrent();
 

+int

 initgroups(uname, agroup)
 initgroups(uname, agroup)

-       char *uname;
+       const char *uname;

        int agroup;
 {
        int groups[NGROUPS], ngroups = 0;
        register struct group *grp;
        register int i;
 
        int agroup;
 {
        int groups[NGROUPS], ngroups = 0;
        register struct group *grp;
        register int i;
 

-       if (agroup >= 0)
+       /*
+        * If installing primary group, duplicate it;
+        * the first element of groups is the effective gid
+        * and will be overwritten when a setgid file is executed.
+        */
+       if (agroup >= 0) {

                groups[ngroups++] = agroup;
                groups[ngroups++] = agroup;

+               groups[ngroups++] = agroup;
+       }

        setgrent();
        setgrent();

-       while (grp = getgrent())
+       while (grp = getgrent()) {
+               if (grp->gr_gid == agroup)
+                       continue;

                for (i = 0; grp->gr_mem[i]; i++)
                        if (!strcmp(grp->gr_mem[i], uname)) {
                for (i = 0; grp->gr_mem[i]; i++)
                        if (!strcmp(grp->gr_mem[i], uname)) {

-                               groups[ngroups++] = grp->gr_gid;

                                if (ngroups == NGROUPS) {
                                if (ngroups == NGROUPS) {

-fprintf(stderr, "inigrp: %s is in too many groups\n", uname);
+fprintf(stderr, "initgroups: %s is in too many groups\n", uname);

                                        goto toomany;
                                }
                                        goto toomany;
                                }

+                               groups[ngroups++] = grp->gr_gid;

                        }
                        }

+       }

 toomany:
 toomany:

+       endgrent();

        if (setgroups(ngroups, groups) < 0) {
        if (setgroups(ngroups, groups) < 0) {

-               perror("setgrp");
-               return (1);
+               perror("setgroups");
+               return (-1);

        }
        return (0);
 }
        }
        return (0);
 }