diff options
| author | Volker Lendecke <vl@samba.org> | 2011-03-14 21:16:23 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-03-14 22:02:35 +0100 |
| commit | 8dfa224c1350a9cb3a2d35fae7721bebecfe7934 (patch) | |
| tree | e6915b8db5989f3f11629efca8ae231825907cad | |
| parent | e818090e245776ca1bcd362a47864eee35ed55ba (diff) | |
| download | samba-8dfa224c1350a9cb3a2d35fae7721bebecfe7934.tar.gz samba-8dfa224c1350a9cb3a2d35fae7721bebecfe7934.tar.bz2 samba-8dfa224c1350a9cb3a2d35fae7721bebecfe7934.zip | |
s3: Change tldap_entry_attributes to the "array,count" convention
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Mon Mar 14 22:02:35 CET 2011 on sn-devel-104
| -rw-r--r-- | source3/include/tldap.h | 5 | ||||
| -rw-r--r-- | source3/lib/tldap.c | 5 | ||||
| -rw-r--r-- | source3/lib/tldap_util.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source3/include/tldap.h b/source3/include/tldap.h index 6bd086b800..36cbdce2dd 100644 --- a/source3/include/tldap.h +++ b/source3/include/tldap.h @@ -108,8 +108,9 @@ int tldap_search(struct tldap_context *ld, TALLOC_CTX *mem_ctx, struct tldap_message ***entries, struct tldap_message ***refs); bool tldap_entry_dn(struct tldap_message *msg, char **dn); -bool tldap_entry_attributes(struct tldap_message *msg, int *num_attributes, - struct tldap_attribute **attributes); +bool tldap_entry_attributes(struct tldap_message *msg, + struct tldap_attribute **attributes, + int *num_attributes); struct tevent_req *tldap_add_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c index 1dd380f259..9523fdeab9 100644 --- a/source3/lib/tldap.c +++ b/source3/lib/tldap.c @@ -1958,8 +1958,9 @@ bool tldap_entry_dn(struct tldap_message *msg, char **dn) return true; } -bool tldap_entry_attributes(struct tldap_message *msg, int *num_attributes, - struct tldap_attribute **attributes) +bool tldap_entry_attributes(struct tldap_message *msg, + struct tldap_attribute **attributes, + int *num_attributes) { if ((msg->dn == NULL) && (!tldap_parse_search_entry(msg))) { return false; diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c index 8f7ad883ef..52bacfd843 100644 --- a/source3/lib/tldap_util.c +++ b/source3/lib/tldap_util.c @@ -28,7 +28,7 @@ bool tldap_entry_values(struct tldap_message *msg, const char *attribute, 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; } |