[Pkg-openldap-devel] [openldap] 01/02: Revert "Fix build with Heimdal 7.2.0"

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch stretch-backports
in repository openldap.

commit 7a3676e06b49bc50788a17fabc45cf4cf8df2c53
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed Aug 2 09:04:51 2017 -0700

    Revert "Fix build with Heimdal 7.2.0"
    
    This reverts commit c6ffc3add95688707dee2a4a0bfabe4446aa5799.
---
 debian/control             |  2 +-
 debian/patches/heimdal-fix | 23 +++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bb68a5f..a74267e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Steve Langasek <vorlon at debian.org>,
 Build-Depends: debhelper (>= 10),
                dpkg-dev (>= 1.17.14),
                groff-base,
-               heimdal-multidev (>= 7.4.0.dfsg.1-1~) <!stage1>,
+               heimdal-multidev <!stage1>,
                libdb5.3-dev <!stage1>,
                libgnutls28-dev,
                libltdl-dev <!stage1>,
diff --git a/debian/patches/heimdal-fix b/debian/patches/heimdal-fix
new file mode 100644
index 0000000..4aad47c
--- /dev/null
+++ b/debian/patches/heimdal-fix
@@ -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>
+
+--- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
++++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+@@ -470,7 +470,7 @@ static int smbk5pwd_exop_passwd(
+ 		}
+ 
+ 		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 );
diff --git a/debian/patches/series b/debian/patches/series
index 8db1412..4e9f27d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,7 @@ fix-build-top-mk
 no-AM_INIT_AUTOMAKE
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
+heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
 set-maintainer-name
 ITS8650-retry-gnutls_handshake-after-GNUTLS_E_AGAIN.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git