[Fedora-directory-commits] mod_admserv mod_admserv.c,1.20,1.21

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27172

Modified Files:
	mod_admserv.c 
Log Message:
Updated the module hook registration order to deal with the proper Apache 2.2 module name (mod_auth_basic)


Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_admserv.c	24 Feb 2006 16:19:23 -0000	1.20
+++ mod_admserv.c	1 Mar 2006 18:43:51 -0000	1.21
@@ -2680,7 +2680,13 @@
 static void register_hooks(apr_pool_t *p)
 {
     /* Do basic auth after our own auth */
+#ifdef AP_SERVER_MAJORVERSION_NUMBER
+    /* Apache 2.2+ */
+    static const char * const aszPost[] = { "mod_auth_basic.c", NULL };
+#else
+    /* Apache 2.0 and earlier uses a different module name than 2.2+ */
     static const char * const aszPost[] = { "mod_auth.c", NULL };
+#endif
     /* Make sure mod_nss has been configured before us */
     static const char * const aszPre[] = { "mod_nss.c", NULL };