CVS commit: pkgsrc/databases/openldap

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Jan 19 15:08:26 UTC 2023

Modified Files:
        pkgsrc/databases/openldap: distinfo
Added Files:
        pkgsrc/databases/openldap/patches:
            patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c

Log Message:
Build fix: Detect hdb_generate_key_set_password() signature change

Details about the API change can be found here:
https://github.com/heimdal/heimdal/issues/246


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/databases/openldap/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap/distinfo
diff -u pkgsrc/databases/openldap/distinfo:1.133 pkgsrc/databases/openldap/distinfo:1.134
--- pkgsrc/databases/openldap/distinfo:1.133    Fri Jul 15 07:19:59 2022
+++ pkgsrc/databases/openldap/distinfo  Thu Jan 19 15:08:26 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2022/07/15 07:19:59 adam Exp $
+$NetBSD: distinfo,v 1.134 2023/01/19 15:08:26 manu Exp $
 
 BLAKE2s (openldap-2.6.3.tgz) = 78a0323fc25ade65fe6c840214b37cab72a5d82a1369babc6cf784180e36dfc9
 SHA512 (openldap-2.6.3.tgz) = 56efbbfc68779ad635d2c25228eb9c4f1553b107b96e8a438029b1c5d2f2647cf4d437770554392b436718ea44a4813e17f5195049f67fc09d063a981096cd85
@@ -9,6 +9,7 @@ SHA1 (patch-contrib_slapd-modules_nops_M
 SHA1 (patch-contrib_slapd-modules_nops_nops.c) = 72c28de4b09cbac7e793828dfcf04820643dcbec
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
 SHA1 (patch-contrib_slapd-modules_smbk5pwd_Makefile) = a57b327bdf680fe60b58c07075a0602afeb556fa
+SHA1 (patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c) = 88584e038eab7cd29f4a05c4a6e9884b13d3ee25
 SHA1 (patch-libraries_libldap_Makefile.in) = 663d65fb8c74f0a4813c30072b5b4f11bdcaf6a4
 SHA1 (patch-libraries_libldap_cyrus.c) = 1e47cdf4b1f1cc4eef36cf40a6beec1bed167f85
 SHA1 (patch-libraries_libldap_init.c) = 884d102d7c02cf85b36635b2ac5d6925ec17420f

Added files:

Index: pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c
diff -u /dev/null pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c:1.1
--- /dev/null   Thu Jan 19 15:08:26 2023
+++ pkgsrc/databases/openldap/patches/patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c   Thu Jan 19 15:08:26 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-contrib_slapd-modules_smbk5pwd_smbk5pwd.c,v 1.1 2023/01/19 15:08:26 manu Exp $
+
+Detect hdb_generate_key_set_password() signature change in Heimdal 7.1
+
+Details can be found here:
+https://github.com/heimdal/heimdal/issues/246
+
+--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig     2023-01-19 09:14:54.607644432 +0100
++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c  2023-01-19 09:18:41.602844881 +0100
+@@ -396,10 +396,15 @@
+                               "dn=\"%s\" missing krb5KeyVersionNumber\n",
+                               op->o_log_prefix, e->e_name.bv_val );
+               }
+ 
++#if (HDB_INTERFACE_VERSION >= 10)
+               ret = hdb_generate_key_set_password(context, ent.principal,
+                       qpw->rs_new.bv_val, &ent.keys.val, &nkeys);
++#else
++              ret = hdb_generate_key_set_password(context, ent.principal,
++                      qpw->rs_new.bv_val, NULL, 0, &ent.keys.val, &nkeys);
++#endif
+               ent.keys.len = nkeys;
+               hdb_seal_keys(context, db, &ent);
+               krb5_free_principal( context, ent.principal );
+