You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2011/04/14 15:43:04 UTC
svn commit: r1092235 - in /httpd/httpd/branches/2.2.x: STATUS
include/mpm_common.h server/mpm_common.c
Author: trawick
Date: Thu Apr 14 13:43:04 2011
New Revision: 1092235
URL: http://svn.apache.org/viewvc?rev=1092235&view=rev
Log:
Grab trunk r1082250:
mpm_common.h: Add prototype for initgroups()
Submitted by: fuankg
Reviewed by: wrowe, trawick
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/include/mpm_common.h
httpd/httpd/branches/2.2.x/server/mpm_common.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1092235&r1=1092234&r2=1092235&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr 14 13:43:04 2011
@@ -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
Modified: httpd/httpd/branches/2.2.x/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/mpm_common.h?rev=1092235&r1=1092234&r2=1092235&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/mpm_common.h (original)
+++ httpd/httpd/branches/2.2.x/include/mpm_common.h Thu Apr 14 13:43:04 2011
@@ -218,6 +218,19 @@ AP_DECLARE(gid_t) ap_gname2id(const char
#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 {
Modified: httpd/httpd/branches/2.2.x/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm_common.c?rev=1092235&r1=1092234&r2=1092235&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm_common.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm_common.c Thu Apr 14 13:43:04 2011
@@ -561,7 +561,7 @@ int initgroups(const char *name, gid_t b
return setgroups(index, groups);
#endif /* def QNX */
}
-#endif /* def NEED_INITGROUPS */
+#endif /* def HAVE_INITGROUPS */
#ifdef AP_MPM_USES_POD
Re: svn commit: r1092235 - in /httpd/httpd/branches/2.2.x: STATUS
include/mpm_common.h server/mpm_common.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Thu, Apr 14, 2011 at 9:43 AM, <tr...@apache.org> wrote:
> Author: trawick
> Date: Thu Apr 14 13:43:04 2011
> New Revision: 1092235
>
> URL: http://svn.apache.org/viewvc?rev=1092235&view=rev
> Log:
> Grab trunk r1082250:
>
> mpm_common.h: Add prototype for initgroups()
>
> Submitted by: fuankg
> Reviewed by: wrowe, trawick
>
> Modified:
> httpd/httpd/branches/2.2.x/STATUS
> httpd/httpd/branches/2.2.x/include/mpm_common.h
> httpd/httpd/branches/2.2.x/server/mpm_common.c
>
> Modified: httpd/httpd/branches/2.2.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1092235&r1=1092234&r2=1092235&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/STATUS (original)
> +++ httpd/httpd/branches/2.2.x/STATUS Thu Apr 14 13:43:04 2011
> @@ -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
>
> Modified: httpd/httpd/branches/2.2.x/include/mpm_common.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/mpm_common.h?rev=1092235&r1=1092234&r2=1092235&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/include/mpm_common.h (original)
> +++ httpd/httpd/branches/2.2.x/include/mpm_common.h Thu Apr 14 13:43:04 2011
> @@ -218,6 +218,19 @@ AP_DECLARE(gid_t) ap_gname2id(const char
>
> #ifdef AP_MPM_USES_POD
>
> +#ifndef HAVE_INITGROUPS
> +/**
> + * The initgroups() function initializes the group access list by reading the
...
Oops, the trunk patch didn't quite work, as this initgroups() stuff
needs to be outside of the AP_MPM_USES_POD check.
Fixing shortly...