Changeset 745 for trunk/server/source3/include/tldap_util.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_util.h (modified) (2 diffs)

trunk/server/source3/include/tldap_util.h

@@ -24 +24 @@
 
 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);
@@ -34 +34 @@
 bool tldap_pull_guid(struct tldap_message *msg, const char *attribute,
                      struct GUID *guid);
-bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx,
+                         struct tldap_mod **pmods, int *pnum_mods,
                          int mod_op, const char *attrib,
-                         int num_values, DATA_BLOB *values);
-bool tldap_add_mod_str(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+                         DATA_BLOB *newvals, int num_newvals);
+bool tldap_add_mod_str(TALLOC_CTX *mem_ctx,
+                       struct tldap_mod **pmods, int *pnum_mods,
                        int mod_op, const char *attrib, const char *str);
 bool tldap_make_mod_blob(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
-                         int *pnum_mods, struct tldap_mod **pmods,
+                         struct tldap_mod **pmods, int *pnum_mods,
                          const char *attrib, DATA_BLOB newval);
 bool tldap_make_mod_fmt(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
-                        int *pnum_mods, struct tldap_mod **pmods,
+                        struct tldap_mod **pmods, int *pnum_mods,
                         const char *attrib, const char *fmt, ...);