lighttpd-initgroups.patch

   1 Index: trunk/src/server.c
   2 ===================================================================
   3 --- trunk/src/server.c (revision 262)
   4 +++ trunk/src/server.c (revision 270)
   5 @@ -564,7 +564,11 @@
   6                         setgroups(0, NULL);
   7                 }
   8 -               if (srv->srvconf.username->used && srv->srvconf.groupname->used)
   9 -                       initgroups(srv->srvconf.username->ptr, grp->gr_gid);
  10 -               if (srv->srvconf.username->used) setuid(pwd->pw_uid);
  11 +
  12 +               if (srv->srvconf.username->used) {
  13 +                       if (srv->srvconf.groupname->used) {
  14 +                               initgroups(srv->srvconf.username->ptr, grp->gr_gid);
  15 +                       }
  16 +                       setuid(pwd->pw_uid);
  17 +               }
  18  #endif
  19         } else {
  20 Index: trunk/src/spawn-fcgi.c
  21 ===================================================================
  22 --- trunk/src/spawn-fcgi.c (revision 67)
  23 +++ trunk/src/spawn-fcgi.c (revision 270)
  24 @@ -333,7 +333,11 @@
  25                 if (groupname) {
  26                         setgid(grp->gr_gid);
  27 -                       setgroups(0, NULL);
  28 -               }
  29 -               if (username) setuid(pwd->pw_uid);
  30 +               }
  31 +               if (username) {
  32 +                       if (groupname) {
  33 +                               initgroups(username, grp->gr_gid);
  34 +                       }
  35 +                       setuid(pwd->pw_uid);
  36 +               }
  37         }
  38