[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8dfa224 s3: Change tldap_entry_attributes to the "array,count" convention
      from  e818090 s3: Fix bug 8009 - net rap session cannot get username

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8dfa224c1350a9cb3a2d35fae7721bebecfe7934
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 14 21:16:23 2011 +0100

    s3: Change tldap_entry_attributes to the "array,count" convention
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Mar 14 22:02:35 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/include/tldap.h  |    5 +++--
 source3/lib/tldap.c      |    5 +++--
 source3/lib/tldap_util.c |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/tldap.h b/source3/include/tldap.h
index 6bd086b..36cbdce 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 1dd380f..9523fde 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 8f7ad88..52bacfd 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;
 	}
 


-- 
Samba Shared Repository