r10656: BIG merge from trunk. Features not copied over

[samba.git] / source / passdb / pdb_nds.c

diff --git a/source/passdb/pdb_nds.c b/source/passdb/pdb_nds.c
index 0b1d39a81bb984eeb3527b739a0f45e709bc2f9d..599a198c5a4cf7d122671ecb4e265032581823f9 100644 (file)
--- a/source/passdb/pdb_nds.c
+++ b/source/passdb/pdb_nds.c
@@ -550,7 +550,7 @@ static int nmasldap_get_password(
        LDAP     *ld,
        char     *objectDN,
        size_t   *pwdSize,      /* in bytes */
-       char     *pwd )
+       unsigned char     *pwd )
 {
        int err = 0;
 
@@ -714,9 +714,13 @@ int pdb_nds_set_password(
        if (rc == LDAP_SUCCESS) {
                DEBUG(5,("NDS Universal Password changed for user %s\n", object_dn));
        } else {
+               char *ld_error = NULL;
+               ldap_get_option(ld, LDAP_OPT_ERROR_STRING, &ld_error);
+               
                /* This will fail if Universal Password is not enabled for the user's context */
-               DEBUG(3,("NDS Universal Password could not be changed for user %s: %d\n",
-                                object_dn, rc));
+               DEBUG(3,("NDS Universal Password could not be changed for user %s: %s (%s)\n",
+                                object_dn, ldap_err2string(rc), ld_error?ld_error:"unknown"));
+               SAFE_FREE(ld_error);
        }
 
        /* Set eDirectory Password */