diff options
| author | Volker Lendecke <vl@samba.org> | 2011-02-12 17:00:30 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-02-13 12:11:53 +0100 |
| commit | fe551d681586adde38d4a01230f494ce0dd87b2c (patch) | |
| tree | 9b42e30148b309f854683506cdf00ec0e28e5aa1 | |
| parent | 84abb428f640e4c48a7231ed78383b197ed715a9 (diff) | |
| download | samba-fe551d681586adde38d4a01230f494ce0dd87b2c.tar.gz samba-fe551d681586adde38d4a01230f494ce0dd87b2c.tar.bz2 samba-fe551d681586adde38d4a01230f494ce0dd87b2c.zip | |
s3: Convert tldap_entry_values args to "array, count"
| -rw-r--r-- | source3/include/tldap_util.h | 2 | ||||
| -rw-r--r-- | source3/lib/tldap_util.c | 8 | ||||
| -rw-r--r-- | source3/passdb/pdb_ads.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/tldap_util.h b/source3/include/tldap_util.h index 6a99a5f78a..53b0c7ba25 100644 --- 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 e42188a2ab..b83a1b75f0 100644 --- 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 8c5ea81145..4864d9b351 100644 --- 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; } |