packages: apache-mod_auth_kerb/apache-mod_auth_kerb.spec, apache-mod_auth_k...

[baggins]

Author: baggins                      Date: Wed Mar 23 23:06:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6
- added basic-auth.patch with option to register as AuthType Basic
  (useful for mixing kerberos with other auth providers like ldap or file)

---- Files affected:
packages/apache-mod_auth_kerb:
   apache-mod_auth_kerb.spec (1.26 -> 1.27) , apache-mod_auth_kerb-basic-auth.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec
diff -u packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec:1.26 packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec:1.27
--- packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec:1.26	Sat Nov 13 13:07:03 2010
+++ packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec	Thu Mar 24 00:06:47 2011
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Moduł uwierzytelnienia Kerberos dla Apache
 Name:		apache-mod_%{mod_name}
 Version:	5.4
-Release:	5
+Release:	6
 Epoch:		1
 License:	GPL
 Group:		Networking/Daemons/HTTP
@@ -13,6 +13,7 @@
 # Source0-md5:	642b81763ad3ca81dba359cb952da5e3
 Source1:	%{name}.conf
 Patch0:		%{name}-heimdal.patch
+Patch1:		%{name}-basic-auth.patch
 URL:		http://modauthkerb.sourceforge.net/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
@@ -37,6 +38,7 @@
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
@@ -76,6 +78,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2011/03/23 23:06:47  baggins
+- rel 6
+- added basic-auth.patch with option to register as AuthType Basic
+  (useful for mixing kerberos with other auth providers like ldap or file)
+
 Revision 1.26  2010/11/13 12:07:03  pawelz
 - release 5
 

================================================================
Index: packages/apache-mod_auth_kerb/apache-mod_auth_kerb-basic-auth.patch
diff -u /dev/null packages/apache-mod_auth_kerb/apache-mod_auth_kerb-basic-auth.patch:1.1
--- /dev/null	Thu Mar 24 00:06:52 2011
+++ packages/apache-mod_auth_kerb/apache-mod_auth_kerb-basic-auth.patch	Thu Mar 24 00:06:47 2011
@@ -0,0 +1,37 @@
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c~	2011-03-24 00:01:16.104419296 +0100
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c	2011-03-24 00:04:28.831007797 +0100
+@@ -157,6 +157,7 @@
+ 	int krb_verify_kdc;
+ 	const char *krb_service_name;
+ 	int krb_authoritative;
++	int krb_register_basic;
+ 	int krb_delegate_basic;
+ #if 0
+ 	int krb_ssl_preauthentication;
+@@ -218,6 +219,9 @@
+    command("KrbAuthoritative", ap_set_flag_slot, krb_authoritative,
+      FLAG, "Set to 'off' to allow access control to be passed along to lower modules iff the UserID is not known to this module."),
+ 
++   command("KrbRegisterBasic", ap_set_flag_slot, krb_register_basic,
++     FLAG, "If 'on' will register with AuthType Basic intead of Kerberos."),
++
+    command("KrbDelegateBasic", ap_set_flag_slot, krb_delegate_basic,
+      FLAG, "Always offer Basic authentication regardless of KrbMethodK5Pass and pass on authentication to lower modules if Basic headers arrive."),
+ 
+@@ -325,6 +329,7 @@
+         ((kerb_auth_config *)rec)->krb_verify_kdc = 1;
+ 	((kerb_auth_config *)rec)->krb_service_name = NULL;
+ 	((kerb_auth_config *)rec)->krb_authoritative = 1;
++	((kerb_auth_config *)rec)->krb_register_basic = 0;
+ 	((kerb_auth_config *)rec)->krb_delegate_basic = 0;
+ #if 0
+ 	((kerb_auth_config *)rec)->krb_ssl_preauthentication = 0;
+@@ -1636,6 +1641,8 @@
+       use_krb5 = 1;
+    else if(type && strcasecmp(type, "KerberosV4") == 0)
+       use_krb4 = 1;
++   else if (type && conf->krb_register_basic && strcasecmp(type, "Basic") == 0)
++      use_krb5 = use_krb4 = 1;
+    else
+       return DECLINED;
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_auth_kerb/apache-mod_auth_kerb.spec?r1=1.26&r2=1.27&f=u