Attachment 4416 Details for Bug 5886 – patch

[patch] patch

0001-Fix-bug-5886.patch (text/plain), 2.20 KB, created by Volker Lendecke on 2009-07-14 16:18:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2009-07-14 16:18:17 UTC

Size: 2.20 KB

patch

obsolete

>From d05054133009526bd9dd08a226747e5cfeef8fc7 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 14 Jul 2009 23:12:59 +0200
>Subject: [PATCH] Fix bug 5886
>
>Ok, that's a very long-standing one. I finally got around to install a recent
>OpenLDAP and test the different variants of setting a NULL password etc.
>
>Thanks all for your patience!
>
>Volker
>---
> source3/passdb/pdb_ldap.c |   34 ++++++++++++++++++++++++++--------
> 1 files changed, 26 insertions(+), 8 deletions(-)
>
>diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>index 11554a7..1b1e22f 100644
>--- a/source3/passdb/pdb_ldap.c
>+++ b/source3/passdb/pdb_ldap.c
>@@ -1701,6 +1701,7 @@ static NTSTATUS ldapsam_modify_entry(struct pdb_methods *my_methods,
> 		char *utf8_password;
> 		char *utf8_dn;
> 		size_t converted_size;
>+		int ret;
> 
> 		if (!ldap_state->is_nds_ldap) {
> 
>@@ -1732,14 +1733,31 @@ static NTSTATUS ldapsam_modify_entry(struct pdb_methods *my_methods,
> 		}
> 
> 		if ((ber_printf (ber, "{") < 0) ||
>-		    (ber_printf (ber, "ts", LDAP_TAG_EXOP_MODIFY_PASSWD_ID, utf8_dn) < 0) ||
>-		    (ber_printf (ber, "ts", LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, utf8_password) < 0) ||
>-		    (ber_printf (ber, "n}") < 0)) {
>-			DEBUG(0,("ldapsam_modify_entry: ber_printf returns a value <0\n"));
>-                       ber_free(ber,1);
>-                       TALLOC_FREE(utf8_dn);
>-                       TALLOC_FREE(utf8_password);
>-                       return NT_STATUS_UNSUCCESSFUL;
>+		    (ber_printf (ber, "ts", LDAP_TAG_EXOP_MODIFY_PASSWD_ID,
>+				 utf8_dn) < 0)) {
>+			DEBUG(0,("ldapsam_modify_entry: ber_printf returns a "
>+				 "value <0\n"));
>+			ber_free(ber,1);
>+			TALLOC_FREE(utf8_dn);
>+			TALLOC_FREE(utf8_password);
>+			return NT_STATUS_UNSUCCESSFUL;
>+		}
>+
>+		if ((utf8_password != NULL) && (*utf8_password != '\0')) {
>+			ret = ber_printf(ber, "ts}",
>+					 LDAP_TAG_EXOP_MODIFY_PASSWD_NEW,
>+					 utf8_password);
>+		} else {
>+			ret = ber_printf(ber, "}");
>+		}
>+
>+		if (ret < 0) {
>+			DEBUG(0,("ldapsam_modify_entry: ber_printf returns a "
>+				 "value <0\n"));
>+			ber_free(ber,1);
>+			TALLOC_FREE(utf8_dn);
>+			TALLOC_FREE(utf8_password);
>+			return NT_STATUS_UNSUCCESSFUL;
> 		}
> 
> 	        if ((rc = ber_flatten (ber, &bv))<0) {
>-- 
>1.6.0.4
>

Actions: View

Attachments on bug 5886: 3901 | 3902 | 3926 | 4089 | 4416 | 4610 | 5461