Moving the auth_provider APIs into the core binary to avoid a chicken and

egg problem when loading the auth modules vs the providers.  (Can't load the
auth module until the provider has registered.  Can't register the provider until
the auth module is loaded and APIs are available.)

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 1fe22497c337beca1232d7132a7099356b9400f7..d4a675061d59eef4ef6dc08ad19f1ee350cafd8d 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -32,6 +32,7 @@ XINCDIRS      += \
                        $(AP_WORK)/srclib/include/arch/NetWare \
                        $(AP_WORK)/srclib/apr-util/include \
                        $(AP_WORK)/include \
+                       $(AP_WORK)/modules/aaa/ \
                        $(AP_WORK)/modules/filters/ \
                        $(AP_WORK)/modules/generators/ \
                        $(AP_WORK)/modules/http/ \
@@ -183,6 +184,7 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
+       $(OBJDIR)/auth_provider.o \
        $(OBJDIR)/buildmark.o \
        $(OBJDIR)/config.o \
        $(OBJDIR)/connection.o \

diff --git a/apachenw.mcp.zip b/apachenw.mcp.zip
index e2e824ebb2a0e14b2298e7d6fabcc7b7f5e7d8d5..d11b0cc38644699d9e11e65dd2c06625be7bd03c 100644 (file)
Binary files a/apachenw.mcp.zip and b/apachenw.mcp.zip differ

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index deeef84fa274fa71cfa235abbf7e5f59df708825..277450ffb4638e585ec606781395f86c5df79d79 100644 (file)
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -43,6 +43,7 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW
        @echo -DCORE_PRIVATE >> $@
        @echo -I..\include >> $@
        @echo -I..\modules\http >> $@
+       @echo -I..\modules\aaa >> $@
        @echo -I..\os\netware >> $@
        @echo -I..\server\mpm\netware >> $@
        @echo -I..\srclib\apr\include >> $@

diff --git a/build/nw_export.inc b/build/nw_export.inc
index 27185ead30027d0d689f92eb15957343b60d59be..1d2e83f2bd72784a7d268edb25c4b57a44f5dddc 100644 (file)
--- a/build/nw_export.inc
+++ b/build/nw_export.inc
@@ -45,3 +45,4 @@
 #include "util_xml.h"
 
 #include "mod_core.h"
+#include "mod_auth.h"

diff --git a/build/prebuildNW.bat b/build/prebuildNW.bat
index 240b4a6938c54bbed170bd393735f4c8b064e07a..0ce59f1e6609191ce5cc074e4599ff01a7e435d9 100755 (executable)
--- a/build/prebuildNW.bat
+++ b/build/prebuildNW.bat
@@ -36,7 +36,7 @@ copy ..\srclib\pcre\config.hw ..\srclib\pcre\config.h
 copy ..\srclib\pcre\pcre.hw ..\srclib\pcre\pcre.h
 
 @echo Generating the import lists...
-set MWCIncludes=..\include;..\modules\http;..\os\netware;..\server\mpm\netware;..\srclib\apr\include;..\srclib\apr-util\include;+%NovellLibC%
+set MWCIncludes=..\include;..\modules\http;..\modules\aaa;..\os\netware;..\server\mpm\netware;..\srclib\apr\include;..\srclib\apr-util\include;+%NovellLibC%
 mwccnlm -P nw_export.inc -d NETWARE -d CORE_PRIVATE -EP
 awk -f make_nw_export.awk nw_export.i |sort >..\os\netware\httpd.imp
 

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index 75b273a26ba9da6d553ae5ebe3ee2fa34df07368..3b495c7cefded45c440d2707192c6e53b4c832e1 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -215,10 +215,6 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        auth_basic_module \
-       authn_register_provider \
-       authn_lookup_provider \
-       authz_register_provider \
-       authz_lookup_provider \
        $(EOLIST)
        
 #   

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 5ee336b2eb366d7efe27997fc1a5f8eb5fddb1b4..4c7d00b5f711e21b54190eaf80ec08628a2c8b6b 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -215,10 +215,6 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        auth_digest_module \
-       authn_register_provider \
-       authn_lookup_provider \
-       authz_register_provider \
-       authz_lookup_provider \
        $(EOLIST)
        
 #