diff -Nru openldap-2.4.28/contrib/slapd-modules/smbk5pwd/smbk5pwd.c openldap-2.4.28+51~precise1/contrib/slapd-modules/smbk5pwd/smbk5pwd.c --- openldap-2.4.28/contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2011-11-25 18:52:29.000000000 +0000 +++ openldap-2.4.28+51~precise1/contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2012-04-10 18:26:40.000000000 +0000 @@ -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 ); @@ -482,7 +482,7 @@ ASN1_MALLOC_ENCODE(Key, buf, len, &ent.keys.val[i], &len, ret); if (ret != 0) break; - + keys[i].bv_val = (char *)buf; keys[i].bv_len = len; } @@ -508,11 +508,11 @@ ml->sml_numvals = i; ml->sml_values = keys; ml->sml_nvalues = NULL; - + ml = ch_malloc(sizeof(Modifications)); ml->sml_next = qpw->rs_mods; qpw->rs_mods = ml; - + ml->sml_desc = ad_krb5KeyVersionNumber; ml->sml_op = LDAP_MOD_REPLACE; #ifdef SLAP_MOD_INTERNAL @@ -536,13 +536,13 @@ wchar_t *wcs, wc; char *c, *d; struct berval pwd; - + /* Expand incoming UTF8 string to UCS4 */ l = ldap_utf8_chars(qpw->rs_new.bv_val); wcs = ch_malloc((l+1) * sizeof(wchar_t)); ldap_x_utf8s_to_wcs( wcs, qpw->rs_new.bv_val, l ); - + /* Truncate UCS4 to UCS2 */ c = (char *)wcs; for (j=0; jsml_desc = ad_sambaNTPassword; ml->sml_op = LDAP_MOD_REPLACE; #ifdef SLAP_MOD_INTERNAL @@ -589,7 +589,7 @@ keys = ch_malloc( 2 * sizeof(struct berval) ); BER_BVZERO( &keys[1] ); lmhash( &pwd, keys ); - + ml->sml_desc = ad_sambaLMPassword; ml->sml_op = LDAP_MOD_REPLACE; #ifdef SLAP_MOD_INTERNAL @@ -611,7 +611,7 @@ LDAP_PVT_INTTYPE_CHARS(long), "%ld", slap_get_time()); BER_BVZERO( &keys[1] ); - + ml->sml_desc = ad_sambaPwdLastSet; ml->sml_op = LDAP_MOD_REPLACE; #ifdef SLAP_MOD_INTERNAL @@ -1159,7 +1159,7 @@ smbk5pwd.on_bi.bi_db_destroy = smbk5pwd_db_destroy; smbk5pwd.on_bi.bi_extended = smbk5pwd_exop_passwd; - + #ifdef DO_KRB5 smbk5pwd.on_bi.bi_op_bind = smbk5pwd_op_bind; diff -Nru openldap-2.4.28/debian/bzr-builder.manifest openldap-2.4.28+51~precise1/debian/bzr-builder.manifest --- openldap-2.4.28/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ openldap-2.4.28+51~precise1/debian/bzr-builder.manifest 2012-04-10 18:26:40.000000000 +0000 @@ -0,0 +1,3 @@ +# bzr-builder format 0.3 deb-version {debupstream}+51 +lp:ubuntu/openldap revid:package-import@ubuntu.com-20120405093437-mq20viliknrwxo08 +merge openldap lp:~kernevil/+junk/openldap revid:scabrero@zentyal.com-20120410165911-hlqhqo05uyog8yy6 diff -Nru openldap-2.4.28/debian/changelog openldap-2.4.28+51~precise1/debian/changelog --- openldap-2.4.28/debian/changelog 2012-04-10 18:38:06.000000000 +0000 +++ openldap-2.4.28+51~precise1/debian/changelog 2012-04-10 18:26:40.000000000 +0000 @@ -1,3 +1,9 @@ +openldap (2.4.28+51~precise1) precise; urgency=low + + * Auto build. + + -- Kernevil Tue, 10 Apr 2012 18:26:40 +0000 + openldap (2.4.28-1.1ubuntu4) precise; urgency=low * debian/control: Build-Depends on dh-apparmor (LP: #948481) diff -Nru openldap-2.4.28/debian/control openldap-2.4.28+51~precise1/debian/control --- openldap-2.4.28/debian/control 2012-04-10 18:38:06.000000000 +0000 +++ openldap-2.4.28+51~precise1/debian/control 2012-04-10 18:26:40.000000000 +0000 @@ -41,6 +41,17 @@ (slapd). The server can be used to provide a standalone directory service. +Package: slapd-smbk5pwd +Section: net +Priority: extra +Architecture: any +Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: Keeps Samba and Kerberos passwords in sync within slapd. + Extends the PasswordModify Extended Operation to update Kerberos keys + and Samba password hashes for an LDAP user. The Kerberos support is + written for Heimdal using its hdb-ldap backend. The Samba support is + written using the Samba 3.0 LDAP schema. + Package: ldap-utils Section: net Priority: optional diff -Nru openldap-2.4.28/debian/rules openldap-2.4.28+51~precise1/debian/rules --- openldap-2.4.28/debian/rules 2012-04-10 18:38:06.000000000 +0000 +++ openldap-2.4.28+51~precise1/debian/rules 2012-04-10 18:26:40.000000000 +0000 @@ -80,11 +80,13 @@ override_dh_auto_build: dh_auto_build -- $(MAKEVARS) + $(MAKE) -C contrib/slapd-modules/smbk5pwd $(MAKE) -C contrib/slapd-modules/nssov/ $(MAKEVARS) nssov.la $(MAKE) -C contrib/slapd-modules/autogroup override_dh_auto_install: dh_auto_install -- $(MAKEVARS) + $(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir) $(MAKE) -C contrib/slapd-modules/nssov install DESTDIR=$(installdir) $(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir) @@ -116,6 +118,7 @@ override_dh_install: dh_install + rm -rf $(CURDIR)/debian/slapd/usr/lib/ldap/smbk5pwd* chmod 0755 $(CURDIR)/debian/slapd/usr/share/slapd/ldiftopasswd # install AppArmor profile @@ -175,6 +178,10 @@ rm -f contrib/slapd-modules/nssov/nss-pam-ldapd/config.sub contrib/slapd-modules/nssov/nss-pam-ldapd/config.guess # Clean the contrib directory + rm -rf contrib/slapd-modules/smbk5pwd/.libs \ + contrib/slapd-modules/smbk5pwd/smbk5pwd.lo \ + contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ + contrib/slapd-modules/smbk5pwd/smbk5pwd.o rm -rf contrib/slapd-modules/autogroup/.libs \ contrib/slapd-modules/autogroup/autogroup.lo \ contrib/slapd-modules/autogroup/autogroup.la \