Fix perchild MPM so that it can be configured with the move to the

experimental directory.  Fix perchild MPM so that it uses ap_gname2id
for groups instead of ap_uname2id.

Submitted by: Scott Lamb <slamb@slamb.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94760 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1550de2b3af1f3f4c3ce50e4c378af71135e3436..3ce4413e10b53399dae02a6173ddc2ebc690f19b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 2.0.36
 
+  *) Fix perchild MPM so that it can be configured with the move to the
+     experimental directory.  [Scott Lamb <slamb@slamb.org>]
+
+  *) Fix perchild MPM so that it uses ap_gname2id for groups instead of
+     ap_uname2id. [Scott Lamb <slamb@slamb.org>]
+
   *) Fix AcceptPathInfo. PR 8234  [Cliff Woolley]
 
   *) [Security] Added the APLOG_TOCLIENT flag to ap_log_rerror() to

diff --git a/server/mpm/experimental/perchild/config5.m4 b/server/mpm/experimental/perchild/config5.m4
index bd179baed93362f0ad8880ef9e172a6473640a0c..57f3df89e7569fcd8faffb2e8825d4bcf0c10d4b 100644 (file)
--- a/server/mpm/experimental/perchild/config5.m4
+++ b/server/mpm/experimental/perchild/config5.m4
@@ -2,5 +2,5 @@ dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "perchild" ; then
 
-    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_SUBDIR_NAME/Makefile)
 fi

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index f5afce62fa802846b3b96d59fe0b5cd754fc408c..0ac146dfcd13f50b744bbcdbc0962c299821252f 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1834,7 +1834,7 @@ static const char *set_child_per_uid(cmd_parms *cmd, void *dummy, const char *u,
         }
     
         ug->uid = ap_uname2id(u);
-        ug->gid = ap_uname2id(g); 
+        ug->gid = ap_gname2id(g); 
 
 #ifndef BIG_SECURITY_HOLE
         if (ug->uid == 0 || ug->gid == 0) {
@@ -1851,7 +1851,7 @@ static const char *assign_childuid(cmd_parms *cmd, void *dummy, const char *uid,
     int i;
     int matching = 0;
     int u = ap_uname2id(uid);
-    int g = ap_uname2id(gid);
+    int g = ap_gname2id(gid);
     const char *errstr;
     int socks[2];
     perchild_server_conf *sconf = (perchild_server_conf *)