httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chr...@apache.org
Subject svn commit: r709839 - in /httpd/httpd/trunk: ./ build/ modules/aaa/ modules/arch/netware/ os/netware/ os/win32/
Date Sun, 02 Nov 2008 04:21:51 GMT
Author: chrisd
Date: Sat Nov  1 21:21:48 2008
New Revision: 709839

URL: http://svn.apache.org/viewvc?rev=709839&view=rev
Log:
Remove mod_authn_default and mod_authz_default.

Note: I've attempted to work through the Windows and Netware build files,
but if those with such systems could repair any damage, that would be
appreciated.

Removed:
    httpd/httpd/trunk/modules/aaa/mod_authn_default.c
    httpd/httpd/trunk/modules/aaa/mod_authn_default.dsp
    httpd/httpd/trunk/modules/aaa/mod_authz_default.c
    httpd/httpd/trunk/modules/aaa/mod_authz_default.dsp
    httpd/httpd/trunk/modules/arch/netware/mod_authn_default.def
    httpd/httpd/trunk/modules/arch/netware/mod_authz_default.def
Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/build/installwinconf.awk
    httpd/httpd/trunk/build/mkconfNW.awk
    httpd/httpd/trunk/modules/aaa/config.m4
    httpd/httpd/trunk/os/netware/modules.c
    httpd/httpd/trunk/os/win32/BaseAddr.ref

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Sat Nov  1 21:21:48 2008
@@ -138,9 +138,6 @@
     Project_Dep_Name mod_authn_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_authn_default
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_authn_file
     End Project Dependency
     Begin Project Dependency
@@ -156,9 +153,6 @@
     Project_Dep_Name mod_authz_dbm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_authz_default
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name mod_authz_groupfile
     End Project Dependency
     Begin Project Dependency
@@ -1102,30 +1096,6 @@
 
 ###############################################################################
 
-Project: "mod_authn_default"=.\modules\aaa\mod_authn_default.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_basic
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "mod_authn_file"=.\modules\aaa\mod_authn_file.dsp - Package Owner=<4>
 
 Package=<5>
@@ -1249,30 +1219,6 @@
 
 ###############################################################################
 
-Project: "mod_authz_default"=.\modules\aaa\mod_authz_default.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libaprutil
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libhttpd
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mod_auth_basic
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "mod_authz_groupfile"=.\modules\aaa\mod_authz_groupfile.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Nov  1 21:21:48 2008
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) authn/z: Remove mod_authn_default and mod_authz_default.
+     [Chris Darroch]
+
   *) authz: Fix handling of authz configurations, make default authz
      logic replicate 2.2.x authz logic, and replace <Satisfy*>, Reject,
      and AuthzMergeRules directives with Match, <Match*>, and AuthzMerge

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Sat Nov  1 21:21:48 2008
@@ -286,13 +286,11 @@
 	 $(MAKE) $(MAKEOPT) -f mod_authn_core.mak  CFG="mod_authn_core - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak   CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak   CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0
$(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authn_file.mak  CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authnz_ldap.mak CFG="mod_authnz_ldap - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_core.mak  CFG="mod_authz_core - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_dbd.mak   CFG="mod_authz_dbd - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_dbm.mak   CFG="mod_authz_dbm - Win32 $(LONG)" RECURSE=0
$(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_authz_default.mak CFG="mod_authz_default - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_groupfile.mak CFG="mod_authz_groupfile - Win32 $(LONG)"
RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_host.mak  CFG="mod_authz_host - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_authz_owner.mak CFG="mod_authz_owner - Win32 $(LONG)" RECURSE=0
$(CTARGET)
@@ -513,14 +511,12 @@
 	copy modules\aaa\$(LONG)\mod_authn_core.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) 	"$(inst_so)" <.y
-	copy modules\aaa\$(LONG)\mod_authn_default.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authnz_ldap.$(src_so)	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_core.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_dbd.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_dbm.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_core.$(src_so) 	"$(inst_so)" <.y
-	copy modules\aaa\$(LONG)\mod_authz_default.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_groupfile.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_host.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_authz_owner.$(src_so) 	"$(inst_so)" <.y

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Sat Nov  1 21:21:48 2008
@@ -211,9 +211,7 @@
 	$(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 \

Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Sat Nov  1 21:21:48 2008
@@ -101,13 +101,11 @@
 	  print "LoadModule authn_core_module modules/mod_authn_core.so" > dstfl;
 	  print "#LoadModule authn_dbd_module modules/mod_authn_dbd.so" > dstfl;
 	  print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" > dstfl;
-	  print "LoadModule authn_default_module modules/mod_authn_default.so" > dstfl;
 	  print "LoadModule authn_file_module modules/mod_authn_file.so" > dstfl;
 	  print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so" > dstfl;
 	  print "LoadModule authz_core_module modules/mod_authz_core.so" > dstfl;
 	  print "#LoadModule authz_dbd_module modules/mod_authz_dbd.so" > dstfl;
 	  print "#LoadModule authz_dbm_module modules/mod_authz_dbm.so" > dstfl;
-	  print "LoadModule authz_default_module modules/mod_authz_default.so" > dstfl;
 	  print "LoadModule authz_groupfile_module modules/mod_authz_groupfile.so" > dstfl;
 	  print "LoadModule authz_host_module modules/mod_authz_host.so" > dstfl;
 	  print "#LoadModule authz_owner_module modules/mod_authz_owner.so" > dstfl;

Modified: httpd/httpd/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/mkconfNW.awk?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/build/mkconfNW.awk (original)
+++ httpd/httpd/trunk/build/mkconfNW.awk Sat Nov  1 21:21:48 2008
@@ -49,11 +49,9 @@
     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"

Modified: httpd/httpd/trunk/modules/aaa/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/config.m4?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/config.m4 (original)
+++ httpd/httpd/trunk/modules/aaa/config.m4 Sat Nov  1 21:21:48 2008
@@ -14,10 +14,6 @@
 APACHE_MODULE(authn_anon, anonymous user authentication control, , , most)
 APACHE_MODULE(authn_dbd, SQL-based authentication control, , , most)
 
-dnl - and just in case all of the above punt; a default handler to
-dnl keep the bad guys out.
-APACHE_MODULE(authn_default, authentication backstopper, , , yes)
-
 dnl General Authentication modules; module which implements the 
 dnl non-authn module specific directives.
 dnl
@@ -47,10 +43,6 @@
   AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
 ])
 
-dnl - and just in case all of the above punt; a default handler to
-dnl keep the bad guys out.
-APACHE_MODULE(authz_default, authorization control backstopper, , , yes)
-
 dnl - host access control compatibility modules. Implements Order, Allow,
 dnl Deny, Satisfy for backward compatibility.  These directives have been
 dnl deprecated in 2.4.

Modified: httpd/httpd/trunk/os/netware/modules.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/netware/modules.c?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/os/netware/modules.c (original)
+++ httpd/httpd/trunk/os/netware/modules.c Sat Nov  1 21:21:48 2008
@@ -29,9 +29,7 @@
 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;
@@ -52,9 +50,7 @@
   &so_module,
   &mime_module,
   &authn_core_module,
-  &authn_default_module,
   &authz_core_module,
-  &authz_default_module,
   &authz_host_module,
   &negotiation_module,
   &include_module,
@@ -77,9 +73,7 @@
   {"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},
@@ -102,9 +96,7 @@
   &so_module,
   &mime_module,
   &authn_core_module,
-  &authn_default_module,
   &authz_core_module,
-  &authz_default_module,
   &authz_host_module,
   &negotiation_module,
   &include_module,

Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=709839&r1=709838&r2=709839&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Sat Nov  1 21:21:48 2008
@@ -52,10 +52,8 @@
 mod_charset_lite.so     0x6FB80000    0x00010000
 mod_authn_anon.so       0x6FB70000    0x00010000
 mod_authn_dbm.so        0x6FB60000    0x00010000
-mod_authn_default.so    0x6FB50000    0x00010000
 mod_authn_file.so       0x6FB40000    0x00010000
 mod_authz_dbm.so        0x6FB30000    0x00010000
-mod_authz_default.so    0x6FB20000    0x00010000
 mod_authz_groupfile.so  0x6FB10000    0x00010000
 mod_authz_host.so       0x6FB00000    0x00010000
 mod_authz_user.so       0x6FAF0000    0x00010000



Mime
View raw message