Remove SimpleUser configuration command, this will all be handled inside mod_unixd.

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

diff --git a/server/mpm/simple/simple_api.c b/server/mpm/simple/simple_api.c
index 3053ad2920b550f73cf3b85837331ebb5d657b35..3c302ae18b22c90d47987eba2db81afa1ab0c30a 100644 (file)
--- a/server/mpm/simple/simple_api.c
+++ b/server/mpm/simple/simple_api.c
@@ -277,28 +277,11 @@ set_threadcount(cmd_parms *cmd, void *baton, const char *arg)
   return NULL;
 }
 
-static const char*
-set_user(cmd_parms *cmd, void *baton, const char *arg)
-{
-  simple_core_t *sc = simple_core_get();
-  const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-  if (err != NULL) {
-    return err;
-  }
-  
-  sc->procmgr.user_name = arg;
-  sc->procmgr.user_id = ap_uname2id(arg);
-
-  return NULL;
-}
-
 static const command_rec simple_cmds[] = {
   AP_INIT_TAKE1("SimpleProcCount", set_proccount, NULL, RSRC_CONF,
                 "Number of child processes launched at server startup"),
   AP_INIT_TAKE1("SimpleThreadCount", set_threadcount, NULL, RSRC_CONF,
                 "Set the number of Worker Threads Per-Process"),
-  AP_INIT_TAKE1("SimpleUser", set_user, NULL, RSRC_CONF,
-                "Sets the user to run child processes as"),
   /* pqXXXXXXXXX: These do NOT belong in the MPM configuration commands. */
   LISTEN_COMMANDS,
   { NULL }

diff --git a/server/mpm/simple/simple_types.h b/server/mpm/simple/simple_types.h
index f27b77b1c7cc659311046bd7d0b70511421c1bd8..f980402671bc3bd32168c497871b4835f6b135c5 100644 (file)
--- a/server/mpm/simple/simple_types.h
+++ b/server/mpm/simple/simple_types.h
@@ -32,8 +32,6 @@ typedef struct {
   int proc_count;
   int thread_count;
   int max_requests_per_child;
-  int user_id;
-  const char *user_name;
 } simple_proc_mgr_t;
 
 typedef struct {