Changeset 427 for vendor/current/source3/libads

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

Location:

vendor/current/source3/libads

Files:

• ldap.c (modified) (2 diffs)
• ldap_printer.c (modified) (2 diffs)

vendor/current/source3/libads/ldap.c

@@ -3856 +3856 @@
                            const char **account_ou)
 {
-        struct ldb_dn *name_dn = NULL;
-        const char *name = NULL;
-        char *ou_string = NULL;
-        struct ldb_context *ldb = ldb_init(mem_ctx, NULL);
-
-        name_dn = ldb_dn_new(mem_ctx, ldb, *account_ou);
-        if (name_dn && ldb_dn_validate(name_dn)) {
-                talloc_free(ldb);
+        char **exploded_dn;
+        const char *name;
+        char *ou_string;
+
+        exploded_dn = ldap_explode_dn(*account_ou, 0);
+        if (exploded_dn) {
+                ldap_value_free(exploded_dn);
                 return ADS_SUCCESS;
         }
@@ -3869 +3868 @@
         ou_string = ads_ou_string(ads, *account_ou);
         if (!ou_string) {
-                talloc_free(ldb);
                 return ADS_ERROR_LDAP(LDAP_INVALID_DN_SYNTAX);
         }
 
-        name_dn = ldb_dn_new_fmt(mem_ctx, ldb, "%s,%s", ou_string,
-                                 ads->config.bind_path);
+        name = talloc_asprintf(mem_ctx, "%s,%s", ou_string,
+                               ads->config.bind_path);
         SAFE_FREE(ou_string);
 
-        if (!name_dn || !ldb_dn_validate(name_dn)) {
-                talloc_free(ldb);
+        if (!name) {
+                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
+        }
+
+        exploded_dn = ldap_explode_dn(name, 0);
+        if (!exploded_dn) {
                 return ADS_ERROR_LDAP(LDAP_INVALID_DN_SYNTAX);
         }
-
-        *account_ou = talloc_strdup(mem_ctx, name);
-        if (!*account_ou) {
-                talloc_free(ldb);
-                return ADS_ERROR_LDAP(LDAP_NO_MEMORY);
-        }
-
-        talloc_free(ldb);
+        ldap_value_free(exploded_dn);
+
+        *account_ou = name;
         return ADS_SUCCESS;
 }

vendor/current/source3/libads/ldap_printer.c

@@ -347 +347 @@
                 for (i=0; i < count; i++) {
                         struct regval_blob v;
-                        DATA_BLOB blob;
-
-                        result = push_spoolss_PrinterData(mem_ctx, &blob,
-                                                          info[i].type,
-                                                          info[i].data);
-                        if (W_ERROR_IS_OK(result)) {
-                                fstrcpy(v.valuename, info[i].value_name);
-                                v.type = info[i].type;
-                                v.data_p = blob.data;
-                                v.size = blob.length;
-
-                                map_regval_to_ads(mem_ctx, mods, &v);
-                        }
+
+                        fstrcpy(v.valuename, info[i].value_name);
+                        v.type = info[i].type;
+                        v.data_p = info[i].data->data;
+                        v.size = info[i].data->length;
+
+                        map_regval_to_ads(mem_ctx, mods, &v);
                 }
         }
@@ -374 +368 @@
                 for (i=0; i < count; i++) {
                         struct regval_blob v;
-                        DATA_BLOB blob = data_blob_null;
-
-                        result = push_spoolss_PrinterData(mem_ctx, &blob,
-                                                          info[i].type,
-                                                          info[i].data);
-                        if (W_ERROR_IS_OK(result)) {
-                                fstrcpy(v.valuename, info[i].value_name);
-                                v.type = info[i].type;
-                                v.data_p = blob.data;
-                                v.size = blob.length;
-
-                                map_regval_to_ads(mem_ctx, mods, &v);
-                        }
+
+                        fstrcpy(v.valuename, info[i].value_name);
+                        v.type = info[i].type;
+                        v.data_p = info[i].data->data;
+                        v.size = info[i].data->length;
+
+                        map_regval_to_ads(mem_ctx, mods, &v);
                 }
         }