Commit 2561cf80 authored by Chris Darroch's avatar Chris Darroch
Browse files

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.


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

Apache.dsw

+0 −54
Original line number Diff line number Diff line
@@ -138,9 +138,6 @@ Package=<4> 
    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 @@ Package=<4> 
    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 @@ Package=<4> 


###############################################################################



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 @@ Package=<4> 


###############################################################################



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>

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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

Makefile.win

+0 −4
Original line number Diff line number Diff line
@@ -286,13 +286,11 @@ _build: 
	 $(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 @@ _copybin: 
	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

NWGNUmakefile

+0 −2
Original line number Diff line number Diff line
@@ -211,9 +211,7 @@ FILES_nlm_objs = \ 
	$(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 \

build/installwinconf.awk

+0 −2
Original line number Diff line number Diff line
@@ -101,13 +101,11 @@ BEGIN { 
	  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;