Update the NetWare makefiles to build the authz code

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 4e91cfa8bfa3bc0ca85b23ac6ab92c0427f19807..b4ed6f07fb2623ecf2f8a6b724ecdd6cd8e25986 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -31,6 +31,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
+                       $(AP_WORK)/modules/aaa/ \
                        $(AP_WORK)/modules/filters/ \
                        $(AP_WORK)/modules/generators/ \
                        $(AP_WORK)/modules/http/ \
@@ -214,6 +215,10 @@ FILES_nlm_objs = \
        $(OBJDIR)/listen.o \
        $(OBJDIR)/log.o \
        $(OBJDIR)/main.o \
+       $(OBJDIR)/mod_authn_core.o \
+       $(OBJDIR)/mod_authn_default.o \
+       $(OBJDIR)/mod_authz_core.o \
+       $(OBJDIR)/mod_authz_default.o \
        $(OBJDIR)/mod_authz_host.o \
        $(OBJDIR)/mod_alias.o \
        $(OBJDIR)/mod_dir.o \

diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 9cd938904121a9a770a566b9e8b0c1c89f00a1d9..b9d175b5933b519fafc9f1ae4bc5191c3b18b046 100644 (file)
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -42,13 +42,17 @@ BEGIN {
     print "#LoadModule auth_basic_module modules/authbasc.nlm"
     print "#LoadModule auth_digest_module modules/authdigt.nlm"
     print "#LoadModule authn_anon_module modules/authnano.nlm"
+    print "#LoadModule authn_dbd_module modules/authndbd.nlm"
     print "#LoadModule authn_dbm_module modules/authndbm.nlm"
     print "#LoadModule authn_default_module modules/authndef.nlm"
     print "#LoadModule authn_file_module modules/authnfil.nlm"
+    print "#LoadModule authz_dbd_module modules/authzdbd.nlm"
     print "#LoadModule authz_dbm_module modules/authzdbm.nlm"
     print "#LoadModule authz_default_module modules/authzdef.nlm"
     print "#LoadModule authz_groupfile_module modules/authzgrp.nlm"
     print "#LoadModule authz_user_module modules/authzusr.nlm"
+    print "#LoadModule authnz_ldap_module modules/authnzldap.nlm"
+    print "#LoadModule ldap_module modules/utilldap.nlm"
     print "#LoadModule asis_module modules/mod_asis.nlm"
     print "LoadModule autoindex_module modules/autoindex.nlm"
     print "#LoadModule cern_meta_module modules/cernmeta.nlm"

diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index 7756b0f11485bab2d62cede92dfb6d127fcd79d0..7a1cdba0acde294c6ba9c774a021fc120a28cf61 100644 (file)
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -155,15 +155,11 @@ TARGET_nlm = \
        $(OBJDIR)/authbasc.nlm \
        $(OBJDIR)/authdigt.nlm \
        $(OBJDIR)/authnano.nlm \
-       $(OBJDIR)/authnalias.nlm \
-       $(OBJDIR)/authncore.nlm \
+       $(OBJDIR)/authndbd.nlm \
        $(OBJDIR)/authndbm.nlm \
-       $(OBJDIR)/authndef.nlm \
        $(OBJDIR)/authnfil.nlm \
-       $(OBJDIR)/authndbd.nlm \
-       $(OBJDIR)/authzcore.nlm \
+       $(OBJDIR)/authzdbd.nlm \
        $(OBJDIR)/authzdbm.nlm \
-       $(OBJDIR)/authzdef.nlm \
        $(OBJDIR)/authzgrp.nlm \
        $(OBJDIR)/authzusr.nlm \
        $(OBJDIR)/authzusr.nlm \

diff --git a/os/netware/modules.c b/os/netware/modules.c
index 153b8c0a07cf4e4342298ac75fc3afe4484ddc9f..f4ab8736b5c8a469a218dbc2e4c1fdd44c7b3394 100644 (file)
--- a/os/netware/modules.c
+++ b/os/netware/modules.c
@@ -28,6 +28,10 @@ extern module mpm_netware_module;
 extern module http_module;
 extern module so_module;
 extern module mime_module;
+extern module authn_core_module;
+extern module authn_default_module;
+extern module authz_core_module;
+extern module authz_default_module;
 extern module authz_host_module;
 extern module negotiation_module;
 extern module include_module;
@@ -47,6 +51,10 @@ module *ap_prelinked_modules[] = {
   &http_module,
   &so_module,
   &mime_module,
+  &authn_core_module,
+  &authn_default_module,
+  &authz_core_module,
+  &authz_default_module,
   &authz_host_module,
   &negotiation_module,
   &include_module,
@@ -68,6 +76,10 @@ ap_module_symbol_t ap_prelinked_module_symbols[] = {
   {"http_module", &http_module},
   {"so_module", &so_module},
   {"mime_module", &mime_module},
+  {"authn_core_module", &authn_core_module},
+  {"authn_default_module", &authn_default_module},
+  {"authz_core_module", &authz_core_module},
+  {"authz_default_module", &authz_default_module},
   {"authz_host_module", &authz_host_module},
   {"negotiation_module", &negotiation_module},
   {"include_module", &include_module},
@@ -89,6 +101,10 @@ module *ap_preloaded_modules[] = {
   &http_module,
   &so_module,
   &mime_module,
+  &authn_core_module,
+  &authn_default_module,
+  &authz_core_module,
+  &authz_default_module,
   &authz_host_module,
   &negotiation_module,
   &include_module,