Changeset 745 for trunk/server/source3/lib/tldap_util.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/tldap_util.c (modified) (17 diffs)

trunk/server/source3/lib/tldap_util.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "tldap.h"
+#include "tldap_util.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/asn1.h"
+#include "../librpc/ndr/libndr.h"
 
 bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
-                        int *num_values, DATA_BLOB **values)
+                        DATA_BLOB **values, int *num_values)
 {
         struct tldap_attribute *attributes;
         int i, num_attributes;
 
-        if (!tldap_entry_attributes(msg, &num_attributes, &attributes)) {
+        if (!tldap_entry_attributes(msg, &attributes, &num_attributes)) {
                 return false;
         }
@@ -52 +57 @@
                 return NULL;
         }
-        if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+        if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
                 return NULL;
         }
@@ -104 +109 @@
 
 static bool tldap_add_blob_vals(TALLOC_CTX *mem_ctx, struct tldap_mod *mod,
-                                int num_newvals, DATA_BLOB *newvals)
+                                DATA_BLOB *newvals, int num_newvals)
 {
         int num_values = talloc_array_length(mod->values);
@@ -129 +134 @@
 }
 
-bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx,
+                         struct tldap_mod **pmods, int *pnum_mods,
                          int mod_op, const char *attrib,
-                         int num_newvals, DATA_BLOB *newvals)
+                         DATA_BLOB *newvals, int num_newvals)
 {
         struct tldap_mod new_mod;
@@ -145 +151 @@
         }
 
-        num_mods = talloc_array_length(mods);
+        num_mods = *pnum_mods;
 
         for (i=0; i<num_mods; i++) {
@@ -167 +173 @@
 
         if ((num_newvals != 0)
-            && !tldap_add_blob_vals(mods, mod, num_newvals, newvals)) {
-                return false;
-        }
-
-        if (i == num_mods) {
+            && !tldap_add_blob_vals(mods, mod, newvals, num_newvals)) {
+                return false;
+        }
+
+        if ((i == num_mods) && (talloc_array_length(mods) < num_mods + 1)) {
                 mods = talloc_realloc(talloc_tos(), mods, struct tldap_mod,
                                       num_mods+1);
@@ -181 +187 @@
 
         *pmods = mods;
+        *pnum_mods += 1;
         return true;
 }
 
-bool tldap_add_mod_str(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+bool tldap_add_mod_str(TALLOC_CTX *mem_ctx,
+                       struct tldap_mod **pmods, int *pnum_mods,
                        int mod_op, const char *attrib, const char *str)
 {
@@ -196 +204 @@
         }
 
-        ret = tldap_add_mod_blobs(mem_ctx, pmods, mod_op, attrib, 1, &utf8);
+        ret = tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods, mod_op, attrib,
+                                  &utf8, 1);
         TALLOC_FREE(utf8.data);
         return ret;
@@ -203 +212 @@
 static bool tldap_make_mod_blob_int(struct tldap_message *existing,
                                     TALLOC_CTX *mem_ctx,
-                                    int *pnum_mods, struct tldap_mod **pmods,
+                                    struct tldap_mod **pmods, int *pnum_mods,
                                     const char *attrib, DATA_BLOB newval,
                                     int (*comparison)(const DATA_BLOB *d1,
@@ -213 +222 @@
 
         if ((existing != NULL)
-            && tldap_entry_values(existing, attrib, &num_values, &values)) {
+            && tldap_entry_values(existing, attrib, &values, &num_values)) {
 
                 if (num_values > 1) {
@@ -229 +238 @@
                    an add at the same time if the values are the
                    same... */
-                DEBUG(10,("smbldap_make_mod_blob: attribute |%s| not "
+                DEBUG(10,("tldap_make_mod_blob_int: attribute |%s| not "
                           "changed.\n", attrib));
                 return true;
@@ -243 +252 @@
                  * then you could add new value */
 
-                DEBUG(10, ("smbldap_make_mod_blob: deleting attribute |%s|\n",
+                DEBUG(10, ("tldap_make_mod_blob_int: deleting attribute |%s|\n",
                            attrib));
-                if (!tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_DELETE,
-                                         attrib, 1, &oldval)) {
+                if (!tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods,
+                                         TLDAP_MOD_DELETE,
+                                         attrib, &oldval, 1)) {
                         return false;
                 }
@@ -256 +266 @@
 
         if (newval.data != NULL) {
-                DEBUG(10, ("smbldap_make_mod: adding attribute |%s| value len "
+                DEBUG(10, ("tldap_make_mod_blob_int: adding attribute |%s| value len "
                            "%d\n", attrib, (int)newval.length));
-                if (!tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_ADD,
-                                         attrib, 1, &newval)) {
+                if (!tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods,
+                                         TLDAP_MOD_ADD,
+                                         attrib, &newval, 1)) {
                         return false;
                 }
         }
-        *pnum_mods = talloc_array_length(*pmods);
         return true;
 }
 
 bool tldap_make_mod_blob(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
-                         int *pnum_mods, struct tldap_mod **pmods,
+                         struct tldap_mod **pmods, int *pnum_mods,
                          const char *attrib, DATA_BLOB newval)
 {
-        return tldap_make_mod_blob_int(existing, mem_ctx, pnum_mods, pmods,
+        return tldap_make_mod_blob_int(existing, mem_ctx, pmods, pnum_mods,
                                        attrib, newval, data_blob_cmp);
 }
@@ -299 +309 @@
 
 bool tldap_make_mod_fmt(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
-                        int *pnum_mods, struct tldap_mod **pmods,
+                        struct tldap_mod **pmods, int *pnum_mods,
                         const char *attrib, const char *fmt, ...)
 {
@@ -319 +329 @@
                 blob.data = CONST_DISCARD(uint8_t *, newval);
         }
-        ret = tldap_make_mod_blob_int(existing, mem_ctx, pnum_mods, pmods,
+        ret = tldap_make_mod_blob_int(existing, mem_ctx, pmods, pnum_mods,
                                       attrib, blob, compare_utf8_blobs);
         TALLOC_FREE(newval);
@@ -330 +340 @@
         char *res;
 
-        ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
+        if (ld != NULL) {
+                ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
+        }
         res = talloc_asprintf(mem_ctx, "LDAP error %d (%s), %s", rc,
                               tldap_err2string(rc),
@@ -540 +552 @@
         DATA_BLOB *values;
 
-        if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+        if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
                 return false;
         }