Ticket #1384: server.c.diff

src/server.c

@@ -759 +759 @@
 
                         return -1;
                 }
+#ifdef HAVE_PWD_H
+                /* 
+                 * Change group before chroot, when we have access
+                 * to /etc/group
+                 * */
+                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) {
                         tzset();
@@ -775 +788 @@
 #endif
 #ifdef HAVE_PWD_H
                 /* drop root privs */
-                if (srv->srvconf.groupname->used) {
-                        setgid(grp->gr_gid);
-                        setgroups(0, NULL);
-                }
-
                 if (srv->srvconf.username->used) {
-                        if (srv->srvconf.groupname->used) {
-                                initgroups(srv->srvconf.username->ptr, grp->gr_gid);
-                        }
                         setuid(pwd->pw_uid);
                 }
 #endif