[Pkg-openldap-devel] r1419 - openldap/trunk/debian/patches

[marschap-guest at alioth.debian.org]

Author: marschap-guest
Date: 2012-05-01 13:52:16 +0000 (Tue, 01 May 2012)
New Revision: 1419

Added:
   openldap/trunk/debian/patches/heimdal-fix
Modified:
   openldap/trunk/debian/patches/series
Log:
debian/patches/heimdal-fix: fix arguments of hdb_generate_key_set_password()

Closes: #664930

Added: openldap/trunk/debian/patches/heimdal-fix
===================================================================
--- openldap/trunk/debian/patches/heimdal-fix	                        (rev 0)
+++ openldap/trunk/debian/patches/heimdal-fix	2012-05-01 13:52:16 UTC (rev 1419)
@@ -0,0 +1,23 @@
+Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
+Description: adapt parameters of hdb_generate_key_set_password() to heimdal 1.6~git20120311
+ .
+ With version heimdal 1.6~git20120311 heimdal schanged the number of parameters
+ of function hdb_generate_key_set_password(), implementing a fallback to "default"
+ values when NULL-values are passed for these parameters.
+ .
+ This patch does exactly that.
+ .
+Bug-Debian: 664930
+Reviewed-by: Peter Marschall <peter at adpm.de>
+
+--- openldap-2.4.28.orig/contrib/slapd-modules/smbk5pwd/smbk5pwd.c	2011-11-25 19:52:29.000000000 +0100
++++ openldap-2.4.28/contrib/slapd-modules/smbk5pwd/smbk5pwd.c	2012-03-30 10:03:14.035984880 +0200
+@@ -468,7 +468,7 @@
+ 		}
+ 
+ 		ret = hdb_generate_key_set_password(context, ent.principal,
+-			qpw->rs_new.bv_val, &ent.keys.val, &nkeys);
++			qpw->rs_new.bv_val, NULL, 0, &ent.keys.val, &nkeys);
+ 		ent.keys.len = nkeys;
+ 		hdb_seal_keys(context, db, &ent);
+ 		krb5_free_principal( context, ent.principal );

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2012-05-01 13:52:14 UTC (rev 1418)
+++ openldap/trunk/debian/patches/series	2012-05-01 13:52:16 UTC (rev 1419)
@@ -17,3 +17,4 @@
 no-AM_INIT_AUTOMAKE
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
+heimdal-fix