Author: baggins Date: Wed Dec 9 20:46:29 2009 GMT
Module: packages Tag: HEIMDAL_1_2
---- Log message:
- backport disable-ntlm-digest option from HEAD
---- Files affected:
packages/heimdal:
heimdal-krb5.conf (1.5 -> 1.5.2.1) , heimdal-ntlm-digest.patch (1.2 ->
1.2.2.1) , heimdal.spec (1.175 -> 1.175.2.1)
---- Diffs:
================================================================
Index: packages/heimdal/heimdal-krb5.conf
diff -u packages/heimdal/heimdal-krb5.conf:1.5
packages/heimdal/heimdal-krb5.conf:1.5.2.1
--- packages/heimdal/heimdal-krb5.conf:1.5 Thu Jul 9 15:17:48 2009
+++ packages/heimdal/heimdal-krb5.conf Wed Dec 9 21:46:23 2009
@@ -52,3 +52,8 @@
# acl_file = /var/lib/heimdal/kadmind.acl
# }
# hdb-ldap-create-base = ou=Kerberos,dc=my,dc=domain
+
+[gssapi]
+# PLD specific hack, uncomment this if you don't want
+# GSSAPI/SASL servers to use NTLM digest
+# disable-ntlm-digest = true
================================================================
Index: packages/heimdal/heimdal-ntlm-digest.patch
diff -u packages/heimdal/heimdal-ntlm-digest.patch:1.2
packages/heimdal/heimdal-ntlm-digest.patch:1.2.2.1
--- packages/heimdal/heimdal-ntlm-digest.patch:1.2 Wed Dec 9 13:13:51 2009
+++ packages/heimdal/heimdal-ntlm-digest.patch Wed Dec 9 21:46:23 2009
@@ -1,9 +1,9 @@
---- heimdal-1.3.1/lib/gssapi/ntlm/accept_sec_context.c.orig 2009-11-21
16:41:51.000000000 +0100
-+++ heimdal-1.3.1/lib/gssapi/ntlm/accept_sec_context.c 2009-12-09
12:36:21.000000000 +0100
-@@ -44,7 +44,24 @@
- struct ntlm_server_interface *interface = NULL;
-
- #ifdef DIGEST
+--- heimdal-1.2.1/lib/gssapi/ntlm/accept_sec_context.c.orig 2008-07-28
14:04:39.000000000 +0200
++++ heimdal-1.2.1/lib/gssapi/ntlm/accept_sec_context.c 2009-12-09
21:40:30.074974606 +0100
+@@ -43,6 +43,22 @@
+ _gss_ntlm_allocate_ctx(OM_uint32 *minor_status, ntlm_ctx *ctx)
+ {
+ OM_uint32 maj_stat;
+ krb5_context context = NULL;
+ krb5_error_code ret;
+ krb5_boolean b;
@@ -20,8 +20,6 @@
+
+ if (b)
+ return GSS_S_FAILURE;
-+
- interface = &ntlmsspi_kdc_digest;
- #endif
- if (interface == NULL)
- return GSS_S_FAILURE;
+
+ *ctx = calloc(1, sizeof(**ctx));
+
================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.175
packages/heimdal/heimdal.spec:1.175.2.1
--- packages/heimdal/heimdal.spec:1.175 Tue Nov 24 11:37:04 2009
+++ packages/heimdal/heimdal.spec Wed Dec 9 21:46:23 2009
@@ -7,7 +7,7 @@
Summary(pl.UTF-8): Implementacja Heimdal systemu Kerberos V5
Name: heimdal
Version: 1.2.1
-Release: 12
+Release: 12.1
License: Free
Group: Networking
Source0: http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@
Patch11: %{name}-static-kcm.patch
Patch12: %{name}-kcm.patch
Patch13: %{name}-ac.patch
+Patch14: %{name}-ntlm-digest.patch
URL: http://www.h5l.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake
@@ -346,6 +347,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
rm -f acinclude.m4 cf/{libtool,lt*}.m4
@@ -764,6 +766,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.175.2.1 2009/12/09 20:46:23 baggins
+- backport disable-ntlm-digest option from HEAD
+
Revision 1.175 2009/11/24 10:37:04 baggins
- rel 12
- move libs to /lib, rpcbind requires kerberos libs and /usr may be on NFS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-krb5.conf?r1=1.5&r2=1.5.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-ntlm-digest.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.175&r2=1.175.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
