Changeset 1368

Timestamp:

10/04/2006 07:36:10 AM (23 months ago)

Author:

jan

Message:

merged [270] (fixes #871)

- call initgroups() in spawn-fcgi.c

Location:

branches/lighttpd-1.4.x/src

Files:

• server.c (modified) (1 diff)
• spawn-fcgi.c (modified) (1 diff)

branches/lighttpd-1.4.x/src/server.c

@@ -736 +736 @@
                         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);
+                
+                if (srv->srvconf.username->used) {
+                        if (srv->srvconf.groupname->used) {
+                                initgroups(srv->srvconf.username->ptr, grp->gr_gid);
+                        }
+                        setuid(pwd->pw_uid);
+                }
 #endif
 #ifdef HAVE_PRCTL

branches/lighttpd-1.4.x/src/spawn-fcgi.c

@@ -425 +425 @@
                 if (groupname) {
                         setgid(grp->gr_gid);
-                        setgroups(0, NULL);
-                }
-                if (username) setuid(pwd->pw_uid);
+                }
+                if (username) {
+                        if (groupname) {
+                                initgroups(username, grp->gr_gid);
+                        }
+                        setuid(pwd->pw_uid);
+                }
         }