packages: heimdal/heimdal-krb5.conf, heimdal/heimdal-ntlm-digest.patch, hei...

baggins baggins at pld-linux.org
Wed Dec 9 13:13:56 CET 2009


Author: baggins                      Date: Wed Dec  9 12:13:56 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rename enable-ntlm-digest to disable-... , make more sense that way

---- Files affected:
packages/heimdal:
   heimdal-krb5.conf (1.6 -> 1.7) , heimdal-ntlm-digest.patch (1.1 -> 1.2) , heimdal.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal-krb5.conf
diff -u packages/heimdal/heimdal-krb5.conf:1.6 packages/heimdal/heimdal-krb5.conf:1.7
--- packages/heimdal/heimdal-krb5.conf:1.6	Wed Dec  9 12:45:52 2009
+++ packages/heimdal/heimdal-krb5.conf	Wed Dec  9 13:13:51 2009
@@ -56,4 +56,4 @@
 [gssapi]
 #	PLD specific hack, uncomment this if you don't want
 #	GSSAPI/SASL servers to use NTLM digest
-#	enable-ntlm-digest = false
+#	disable-ntlm-digest = true

================================================================
Index: packages/heimdal/heimdal-ntlm-digest.patch
diff -u packages/heimdal/heimdal-ntlm-digest.patch:1.1 packages/heimdal/heimdal-ntlm-digest.patch:1.2
--- packages/heimdal/heimdal-ntlm-digest.patch:1.1	Wed Dec  9 12:42:39 2009
+++ packages/heimdal/heimdal-ntlm-digest.patch	Wed Dec  9 13:13:51 2009
@@ -1,10 +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,23 @@
+@@ -44,7 +44,24 @@
      struct ntlm_server_interface *interface = NULL;
      
  #ifdef DIGEST
--    interface = &ntlmsspi_kdc_digest;
 +    krb5_context context = NULL;
 +    krb5_error_code ret;
 +    krb5_boolean b;
@@ -13,15 +12,16 @@
 +    if (ret)
 +	return GSS_S_FAILURE;
 +
-+    b = krb5_config_get_bool_default(context, NULL, TRUE,
++    b = krb5_config_get_bool_default(context, NULL, FALSE,
 +				"gssapi",
-+				"enable-ntlm-digest", NULL);
-+
-+    if (b) {
-+	interface = &ntlmsspi_kdc_digest;
-+    }
++				"disable-ntlm-digest", NULL);
 +
 +    krb5_free_context(context);
++
++    if (b)
++	return GSS_S_FAILURE;
++
+     interface = &ntlmsspi_kdc_digest;
  #endif
      if (interface == NULL)
  	return GSS_S_FAILURE;

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.183 packages/heimdal/heimdal.spec:1.184
--- packages/heimdal/heimdal.spec:1.183	Wed Dec  9 12:45:52 2009
+++ packages/heimdal/heimdal.spec	Wed Dec  9 13:13:51 2009
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.3.1
-Release:	0.3
+Release:	0.4
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -777,6 +777,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2009/12/09 12:13:51  baggins
+- rename enable-ntlm-digest to disable-... , make more sense that way
+
 Revision 1.183  2009/12/09 11:45:52  baggins
 - added enable-ntlm-digest option, see patch commit log for details
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-krb5.conf?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-ntlm-digest.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.183&r2=1.184&f=u



More information about the pld-cvs-commit mailing list