Move initgroupgs, ap_uname2id and ap_gname2id from util.c to

mpm_common.c.  These functions are only valid on some platforms,
so they should not be in the main-line code.

These functions are also not portable to non-unix platforms, so they don't
really belong in APR.  Since they are only used in MPMs, for right now,
I am moving them to mpm_common.c


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

2 files changed, 14 insertions, 14 deletions

diff --git a/include/httpd.h b/include/httpd.h
index 388a5d3601..5c03a75797 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1506,20 +1506,6 @@ AP_DECLARE(char *) ap_escape_quotes(apr_pool_t *p, const char *instring);
 
 /* Misc system hackery */
 /**
- * Convert a username to a numeric ID
- * @param name The name to convert
- * @return The user id corresponding to a name
- * @deffunc uid_t ap_uname2id(const char *name) 
- */
-AP_DECLARE(uid_t) ap_uname2id(const char *name);
-/**
- * Convert a group name to a numeric ID
- * @param name The name to convert
- * @return The group id corresponding to a name
- * @deffunc gid_t ap_gname2id(const char *name) 
- */
-AP_DECLARE(gid_t) ap_gname2id(const char *name);
-/**
  * Given the name of an object in the file system determine if it is a directory
  * @param p The pool to allocate out of 
  * @param name The name of the object to check
diff --git a/include/mpm_common.h b/include/mpm_common.h
index dc96d38f49..9ac37754f7 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -128,6 +128,20 @@ void ap_sock_disable_nagle(apr_socket_t *s);
 #define ap_sock_disable_nagle(s)        /* NOOP */
 #endif
 
+/**
+ * Convert a username to a numeric ID
+ * @param name The name to convert
+ * @return The user id corresponding to a name
+ * @deffunc uid_t ap_uname2id(const char *name)
+ */
+AP_DECLARE(uid_t) ap_uname2id(const char *name);
+/**
+ * Convert a group name to a numeric ID
+ * @param name The name to convert
+ * @return The group id corresponding to a name
+ * @deffunc gid_t ap_gname2id(const char *name)
+ */
+AP_DECLARE(gid_t) ap_gname2id(const char *name);
 
 #define AP_MPM_HARD_LIMITS_FILE "src/" APACHE_MPM_DIR "/mpm_default.h"