Changeset 342 for branches/samba-3.3.x/source/passdb

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

Location:

branches/samba-3.3.x/source/passdb

Files:

• lookup_sid.c (modified) (1 diff)
• pdb_ldap.c (modified) (2 diffs)

branches/samba-3.3.x/source/passdb/lookup_sid.c

@@ -1086 +1086 @@
         DATA_BLOB cache_value;
 
-        if (!memcache_lookup(NULL, SID_UID_CACHE,
+        if (!memcache_lookup(NULL, SID_GID_CACHE,
                              data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
                              &cache_value)) {

branches/samba-3.3.x/source/passdb/pdb_ldap.c

@@ -1701 +1701 @@
                 char *utf8_dn;
                 size_t converted_size;
+                int ret;
 
                 if (!ldap_state->is_nds_ldap) {
@@ -1732 +1733 @@
 
                 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);
-                       SAFE_FREE(utf8_dn);
-                       SAFE_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);
+                        SAFE_FREE(utf8_dn);
+                        SAFE_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);
+                        SAFE_FREE(utf8_dn);
+                        SAFE_FREE(utf8_password);
+                        return NT_STATUS_UNSUCCESSFUL;
                 }