Changeset 745 for trunk/server/source3/winbindd/winbindd_reconnect.c

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/winbindd/winbindd_reconnect.c (modified) (9 diffs)

trunk/server/source3/winbindd/winbindd_reconnect.c

@@ -94 +94 @@
                                 TALLOC_CTX *mem_ctx,
                                 uint32 *num_entries, 
-                                struct acct_info **info)
+                                struct wb_acct_info **info)
 {
         NTSTATUS result;
@@ -112 +112 @@
                                   TALLOC_CTX *mem_ctx,
                                   uint32 *num_entries, 
-                                  struct acct_info **info)
+                                  struct wb_acct_info **info)
 {
         NTSTATUS result;
@@ -132 +132 @@
                             const char *name,
                             uint32_t flags,
-                            DOM_SID *sid,
+                            struct dom_sid *sid,
                             enum lsa_SidType *type)
 {
@@ -153 +153 @@
 static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                             TALLOC_CTX *mem_ctx,
-                            const DOM_SID *sid,
+                            const struct dom_sid *sid,
                             char **domain_name,
                             char **name,
@@ -172 +172 @@
 static NTSTATUS rids_to_names(struct winbindd_domain *domain,
                               TALLOC_CTX *mem_ctx,
-                              const DOM_SID *sid,
+                              const struct dom_sid *sid,
                               uint32 *rids,
                               size_t num_rids,
@@ -197 +197 @@
 static NTSTATUS query_user(struct winbindd_domain *domain, 
                            TALLOC_CTX *mem_ctx, 
-                           const DOM_SID *user_sid,
+                           const struct dom_sid *user_sid,
                            struct wbint_userinfo *user_info)
 {
@@ -215 +215 @@
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                                   TALLOC_CTX *mem_ctx,
-                                  const DOM_SID *user_sid,
-                                  uint32 *num_groups, DOM_SID **user_gids)
+                                  const struct dom_sid *user_sid,
+                                  uint32 *num_groups, struct dom_sid **user_gids)
 {
         NTSTATUS result;
@@ -234 +234 @@
 static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
                                    TALLOC_CTX *mem_ctx,
-                                   uint32 num_sids, const DOM_SID *sids,
+                                   uint32 num_sids, const struct dom_sid *sids,
                                    uint32 *num_aliases, uint32 **alias_rids)
 {
@@ -256 +256 @@
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                 TALLOC_CTX *mem_ctx,
-                                const DOM_SID *group_sid,
+                                const struct dom_sid *group_sid,
                                 enum lsa_SidType type,
                                 uint32 *num_names,
-                                DOM_SID **sid_mem, char ***names, 
+                                struct dom_sid **sid_mem, char ***names,
                                 uint32 **name_types)
 {