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

diff --git a/source3/include/tldap.h b/source3/include/tldap.h
index 6bd086b8004783c770f05e93b5d684997f99b454..36cbdce2dd0b68c8dbfb9c4b665fa372919e0716 100644 (file)
--- 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 1dd380f25962db53538e0740271e891069cee2bd..9523fdeab9ff4b96c37b7fe82ffdbd7f404439af 100644 (file)
--- 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 8f7ad883ef131d3a3e9098bebd401f90875591cc..52bacfd8436624b49febf88e8272f487d832889f 100644 (file)
--- 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;
        }