From: Joe Orton <jorton@apache.org>
Date: Mon, 23 Aug 2004 14:50:27 +0000 (+0000)
Subject: Backport from HEAD:
X-Git-Tag: STRIKER_2_0_51_RC1^2~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac8f566befd91e07649bd85e8dd8fe76006fa177;p=thirdparty%2Fapache%2Fhttpd.git

Backport from HEAD:

* modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity
hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook.

PR: 18156
Submitted by: Joshua Slive
Reviewed by: jorton, slive, nd


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

diff --git a/CHANGES b/CHANGES
index d592b7d53a8..b87f0952ce3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.51
 
+  *) mod_userdir: Ensure that the userdir identity is used for
+     suexec userdir access in a virtual host which has suexec configured.  
+     PR 18156.  [Joshua Slive]
+
   *) mod_rewrite no longer confuses the RewriteMap caches if
      different maps defined in different virtual hosts use the
      same map name. PR 26462.  [André Malo]
diff --git a/modules/mappers/mod_userdir.c b/modules/mappers/mod_userdir.c
index faac7a01223..9fcf66f109c 100644
--- a/modules/mappers/mod_userdir.c
+++ b/modules/mappers/mod_userdir.c
@@ -350,7 +350,7 @@ static void register_hooks(apr_pool_t *p)
 
     ap_hook_translate_name(translate_userdir,aszPre,aszSucc,APR_HOOK_MIDDLE);
 #ifdef HAVE_UNIX_SUEXEC
-    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_MIDDLE);
+    ap_hook_get_suexec_identity(get_suexec_id_doer,NULL,NULL,APR_HOOK_FIRST);
 #endif
 }