s3: Convert tldap_entry_values args to "array, count"

diff --git a/source3/include/tldap_util.h b/source3/include/tldap_util.h
index 6a99a5f78a8ab21c7425714645469efd57ad3a26..53b0c7ba253a4217f76d77183f568617ad5b2093 100644 (file)
--- a/source3/include/tldap_util.h
+++ b/source3/include/tldap_util.h
@@ -23,7 +23,7 @@
 #include "includes.h"
 
 bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
-                       int *num_values, DATA_BLOB **values);
+                       DATA_BLOB **values, int *num_values);
 bool tldap_get_single_valueblob(struct tldap_message *msg,
                                const char *attribute, DATA_BLOB *blob);
 char *tldap_talloc_single_attribute(struct tldap_message *msg,

diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c
index e42188a2abb2c8126ab27391f3df1f73c7593c94..b83a1b75f0248435d7eac843538d746baf953632 100644 (file)
--- a/source3/lib/tldap_util.c
+++ b/source3/lib/tldap_util.c
@@ -23,7 +23,7 @@
 #include "../libcli/security/security.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;
@@ -54,7 +54,7 @@ bool tldap_get_single_valueblob(struct tldap_message *msg,
        if (attribute == NULL) {
                return NULL;
        }
-       if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+       if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
                return NULL;
        }
        if (num_values != 1) {
@@ -219,7 +219,7 @@ static bool tldap_make_mod_blob_int(struct tldap_message *existing,
        DATA_BLOB oldval = data_blob_null;
 
        if ((existing != NULL)
-           && tldap_entry_values(existing, attrib, &num_values, &values)) {
+           && tldap_entry_values(existing, attrib, &values, &num_values)) {
 
                if (num_values > 1) {
                        /* can't change multivalue attributes atm */
@@ -547,7 +547,7 @@ bool tldap_entry_has_attrvalue(struct tldap_message *msg,
        int i, num_values;
        DATA_BLOB *values;
 
-       if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+       if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
                return false;
        }
        for (i=0; i<num_values; i++) {

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 8c5ea81145a8f900d640bdf158ab2632b0039929..4864d9b351892b8a228a4fc177261381faa92a14 100644 (file)
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -965,7 +965,7 @@ static NTSTATUS pdb_ads_enum_group_members(struct pdb_methods *m,
                break;
        }
 
-       if (!tldap_entry_values(msg[0], "member", &num_members, &blobs)) {
+       if (!tldap_entry_values(msg[0], "member", &blobs, &num_members)) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
@@ -1548,7 +1548,7 @@ static NTSTATUS pdb_ads_enum_aliasmem(struct pdb_methods *m,
                break;
        }
 
-       if (!tldap_entry_values(msg[0], "member", &num_members, &blobs)) {
+       if (!tldap_entry_values(msg[0], "member", &blobs, &num_members)) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }