s3: Convert tldap_add_mod_blobs args to "array, count"

diff --git a/source3/include/tldap_util.h b/source3/include/tldap_util.h
index 2e0da85f53357207a9a12da967d11ffa968e0a8b..5b2d025cc503489f05d3a55b86f9c61dea2498de 100644 (file)
--- a/source3/include/tldap_util.h
+++ b/source3/include/tldap_util.h
@@ -35,7 +35,7 @@ bool tldap_pull_guid(struct tldap_message *msg, const char *attribute,
                     struct GUID *guid);
 bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
                         int mod_op, const char *attrib,
-                        int num_values, DATA_BLOB *values);
+                        DATA_BLOB *values, int num_values);
 bool tldap_add_mod_str(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
                       int mod_op, const char *attrib, const char *str);
 bool tldap_make_mod_blob(struct tldap_message *existing, TALLOC_CTX *mem_ctx,

diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index 7f1e916338485ea5edde53791798bfe5b0ed5a00..f46cfc834d554c55d0696d116eb21c7368730371 100644 (file)
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -131,9 +131,10 @@ static bool tldap_add_blob_vals(TALLOC_CTX *mem_ctx, struct tldap_mod *mod,
        return true;
 }
 
-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 mod_op, const char *attrib,
-                        int num_newvals, DATA_BLOB *newvals)
+                        DATA_BLOB *newvals, int num_newvals)
 {
        struct tldap_mod new_mod;
        struct tldap_mod *mods = *pmods;
@@ -198,7 +199,7 @@ bool tldap_add_mod_str(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
                return false;
        }
 
-       ret = tldap_add_mod_blobs(mem_ctx, pmods, mod_op, attrib, 1, &utf8);
+       ret = tldap_add_mod_blobs(mem_ctx, pmods, mod_op, attrib, &utf8, 1);
        TALLOC_FREE(utf8.data);
        return ret;
 }
@@ -248,7 +249,7 @@ static bool tldap_make_mod_blob_int(struct tldap_message *existing,
                DEBUG(10, ("smbldap_make_mod_blob: deleting attribute |%s|\n",
                           attrib));
                if (!tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_DELETE,
-                                        attrib, 1, &oldval)) {
+                                        attrib, &oldval, 1)) {
                        return false;
                }
        }
@@ -261,7 +262,7 @@ static bool tldap_make_mod_blob_int(struct tldap_message *existing,
                DEBUG(10, ("smbldap_make_mod: 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)) {
+                                        attrib, &newval, 1)) {
                        return false;
                }
        }

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 108629d6e9151e8e6fe2497ba698cf711dd1905f..867ad48bddcb6416509543e464acb707e26a27b2 100644 (file)
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -331,7 +331,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state,
                blob = data_blob_const(pw_utf16, pw_utf16_len);
 
                ret &= tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_REPLACE,
-                                          "unicodePwd", 1, &blob);
+                                          "unicodePwd", &blob, 1);
                if (ret) {
                        *pnum_mods = talloc_array_length(*pmods);
                }