From: Jeff Trawick <trawick@apache.org>
Date: Thu, 14 Apr 2011 13:43:04 +0000 (+0000)
Subject: Grab trunk r1082250:
X-Git-Tag: 2.2.18~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e3c920d0b796c57535395d61d65d4c9019b4915;p=thirdparty%2Fapache%2Fhttpd.git

Grab trunk r1082250:

mpm_common.h: Add prototype for initgroups()

Submitted by: fuankg
Reviewed by: wrowe, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1092235 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index edf404a853a..84616f5bd3c 100644
--- a/STATUS
+++ b/STATUS
@@ -91,11 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mpm_common.h: Add prototype for initgroups().
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1082250
-     2.2.x patch: Trunk version of patch works with offset  
-     +1 fuankg, trawick, wrowe
-
   * configure: Fix linking htpasswd/htdbm with crypt
      Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1071426
      2.2.x patch: Trunk version of patch works with fuzz
diff --git a/include/mpm_common.h b/include/mpm_common.h
index bacf76f256b..a571b0dd0b2 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -218,6 +218,19 @@ AP_DECLARE(gid_t) ap_gname2id(const char *name);
 
 #ifdef AP_MPM_USES_POD
 
+#ifndef HAVE_INITGROUPS
+/**
+ * The initgroups() function initializes the group access list by reading the
+ * group database /etc/group and using all groups of which user is a member.
+ * The additional group basegid is also added to the list. 
+ * @param name The user name - must be non-NULL
+ * @param basegid The basegid to add
+ * @return returns 0 on success
+ * @fn int initgroups(const char *name, gid_t basegid)
+ */
+int initgroups(const char *name, gid_t basegid);
+#endif
+
 typedef struct ap_pod_t ap_pod_t;
 
 struct ap_pod_t {
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 1c50d45be2f..754fc643388 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -561,7 +561,7 @@ int initgroups(const char *name, gid_t basegid)
     return setgroups(index, groups);
 #endif /* def QNX */
 }
-#endif /* def NEED_INITGROUPS */
+#endif /* def HAVE_INITGROUPS */
 
 #ifdef AP_MPM_USES_POD