Changeset 745 for trunk/server/source3/include/tldap.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/include/tldap.h (modified) (4 diffs)

trunk/server/source3/include/tldap.h

@@ -109 +109 @@
                  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,
@@ -124 +125 @@
 int tldap_add_recv(struct tevent_req *req);
 int tldap_add(struct tldap_context *ld, const char *dn,
-              int num_attributes, struct tldap_mod *attributes,
+              struct tldap_mod *attributes, int num_attributes,
               struct tldap_control *sctrls, int num_sctrls,
               struct tldap_control *cctrls, int num_cctrls);
@@ -132 +133 @@
                                      struct tldap_context *ld,
                                      const char *dn,
-                                     int num_mods, struct tldap_mod *mods,
+                                     struct tldap_mod *mods, int num_mods,
                                      struct tldap_control *sctrls,
                                      int num_sctrls,
@@ -139 +140 @@
 int tldap_modify_recv(struct tevent_req *req);
 int tldap_modify(struct tldap_context *ld, const char *dn,
-                 int num_mods, struct tldap_mod *mods,
+                 struct tldap_mod *mods, int num_mods,
                  struct tldap_control *sctrls, int num_sctrls,
                  struct tldap_control *cctrls, int num_cctrls);