summaryrefslogtreecommitdiffstats
path: root/recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2014-07-15 17:48:54 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-30 00:54:30 -0400
commitfb81abecb4e8b212f30607bf86d5b1fd769fb19d (patch)
treed7c21313e70db1a96bdb916ccdc741c4729dda1c /recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch
parenta3ce5306cdddb8f737f14d746ac1a892019836e3 (diff)
downloadmeta-cloud-services-fb81abecb4e8b212f30607bf86d5b1fd769fb19d.tar.gz
keystone: package openLDAP 2.4.39
The patches are taken from Debian. Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch')
-rw-r--r--recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch b/recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch
new file mode 100644
index 0000000..f6fa7ec
--- /dev/null
+++ b/recipes-support/openldap/openldap-2.4.39/heimdal-fix.patch
@@ -0,0 +1,23 @@
1Author: Mattias Ellert <mattias.ellert@fysast.uu.se>
2Description: adapt parameters of hdb_generate_key_set_password() to heimdal 1.6~git20120311
3 .
4 With version heimdal 1.6~git20120311 heimdal schanged the number of parameters
5 of function hdb_generate_key_set_password(), implementing a fallback to "default"
6 values when NULL-values are passed for these parameters.
7 .
8 This patch does exactly that.
9 .
10Bug-Debian: 664930
11Reviewed-by: Peter Marschall <peter@adpm.de>
12
13--- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
14+++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
15@@ -470,7 +470,7 @@ static int smbk5pwd_exop_passwd(
16 }
17
18 ret = hdb_generate_key_set_password(context, ent.principal,
19- qpw->rs_new.bv_val, &ent.keys.val, &nkeys);
20+ qpw->rs_new.bv_val, NULL, 0, &ent.keys.val, &nkeys);
21 ent.keys.len = nkeys;
22 hdb_seal_keys(context, db, &ent);
23 krb5_free_principal( context, ent.principal );