Changeset 270

Timestamp:

04/09/2005 05:14:35 PM (3 years ago)

Author:

jan

Message:

added initgroups to spawn-fcgi.c to really close #78

Location:

trunk/src

Files:

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

trunk/src/server.c

@@ -564 +564 @@
                         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
         } else {
@@ -981 +985 @@
                 for (ndx = 0; ndx < srv->joblist->used; ndx++) {
                         connection *con = srv->joblist->ptr[ndx];
-                        handler_t r;
 
                         connection_state_machine(srv, con);

trunk/src/spawn-fcgi.c

@@ -333 +333 @@
                 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);
+                }
         }