Changeset 2010

Timestamp:

10/27/2007 11:06:17 PM (9 months ago)

Author:

jan

Message:

fixed initgroup() failing as it is called after chroot() (fixes #1384)

Files:

• trunk/src/server.c (modified) (2 diffs)
• trunk/src/spawn-fcgi.c (modified) (2 diffs)

trunk/src/server.c

@@ -1325 +1325 @@
-                        return -1;
-                }
+
+#ifdef HAVE_PWD_H
+                /**
+                 * initgroups() has to be called before chroot()
+                 */
+                if (srv->srvconf.groupname->used) {
+                        setgid(grp->gr_gid);
+                        setgroups(0, NULL);
+                        if (srv->srvconf.username->used) {
+                                initgroups(srv->srvconf.username->ptr, grp->gr_gid);
+                        }
+                }
+#endif
-#ifdef HAVE_CHROOT
-                if (srv->srvconf.changeroot->used) {
@@ -1341 +1354 @@
-#ifdef HAVE_PWD_H
-                /* drop root privs */
-                if (srv->srvconf.groupname->used) {
-                        setgid(grp->gr_gid);
-                        setgroups(0, NULL);
-                }
-                if (srv->srvconf.username->used && srv->srvconf.groupname->used)
-                        initgroups(srv->srvconf.username->ptr, grp->gr_gid);
-                if (srv->srvconf.username->used) setuid(pwd->pw_uid);
-#endif

trunk/src/spawn-fcgi.c

@@ -430 +430 @@
-                                return -1;
-                        }
+
+                        /* do the change before we do the chroot() */
+                        setgid(grp->gr_gid);
+                        setgroups(0, NULL); 
+
+                        if (username) {
+                                initgroups(username, grp->gr_gid);
+                        }
+
-                }
-
@@ -448 +457 @@
-
-                /* drop root privs */
-                if (groupname) {
-                        setgid(grp->gr_gid);
-                }
-                if (username) {
-                        if (groupname) {
-                                initgroups(username, grp->gr_gid);
-                        }
-                        setuid(pwd->pw_uid);
-                }