Changeset 165 for branches/samba-3.0/source/nsswitch/winbindd_ads.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/nsswitch/winbindd_ads.c (modified) (4 diffs)

branches/samba-3.0/source/nsswitch/winbindd_ads.c

@@ -391 +391 @@
 }
 
+/* convert a single name to a sid in a domain - use rpc methods */
+static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+                            TALLOC_CTX *mem_ctx,
+                            const char *domain_name,
+                            const char *name,
+                            DOM_SID *sid,
+                            enum lsa_SidType *type)
+{
+        return reconnect_methods.name_to_sid(domain, mem_ctx,
+                                             domain_name, name,
+                                             sid, type);
+}
+
+/* convert a domain SID to a user or group name - use rpc methods */
+static NTSTATUS sid_to_name(struct winbindd_domain *domain,
+                            TALLOC_CTX *mem_ctx,
+                            const DOM_SID *sid,
+                            char **domain_name,
+                            char **name,
+                            enum lsa_SidType *type)
+{
+        return reconnect_methods.sid_to_name(domain, mem_ctx, sid,
+                                             domain_name, name, type);
+}
+
+/* convert a list of rids to names - use rpc methods */
+static NTSTATUS rids_to_names(struct winbindd_domain *domain,
+                              TALLOC_CTX *mem_ctx,
+                              const DOM_SID *sid,
+                              uint32 *rids,
+                              size_t num_rids,
+                              char **domain_name,
+                              char ***names,
+                              enum lsa_SidType **types)
+{
+        return reconnect_methods.rids_to_names(domain, mem_ctx, sid,
+                                               rids, num_rids,
+                                               domain_name, names, types);
+}
+
 /* convert a DN to a name, SID and name type 
    this might become a major speed bottleneck if groups have
@@ -830 +870 @@
         ads_msgfree(ads, msg);
         return status;
+}
+
+/* Lookup aliases a user is member of - use rpc methods */
+static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
+                                   TALLOC_CTX *mem_ctx,
+                                   uint32 num_sids, const DOM_SID *sids,
+                                   uint32 *num_aliases, uint32 **alias_rids)
+{
+        return reconnect_methods.lookup_useraliases(domain, mem_ctx,
+                                                    num_sids, sids,
+                                                    num_aliases,
+                                                    alias_rids);
 }
 
@@ -1036 +1088 @@
 }
 
+/* find the lockout policy of a domain - use rpc methods */
+static NTSTATUS lockout_policy(struct winbindd_domain *domain,
+                               TALLOC_CTX *mem_ctx,
+                               SAM_UNK_INFO_12 *policy)
+{
+        return reconnect_methods.lockout_policy(domain, mem_ctx, policy);
+}
+
+/* find the password policy of a domain - use rpc methods */
+static NTSTATUS password_policy(struct winbindd_domain *domain,
+                                TALLOC_CTX *mem_ctx,
+                                SAM_UNK_INFO_1 *policy)
+{
+        return reconnect_methods.password_policy(domain, mem_ctx, policy);
+}
+
 /* get a list of trusted domains */
 static NTSTATUS trusted_domains(struct winbindd_domain *domain,
@@ -1114 +1182 @@
         enum_dom_groups,
         enum_local_groups,
-        msrpc_name_to_sid,
-        msrpc_sid_to_name,
-        msrpc_rids_to_names,
+        name_to_sid,
+        sid_to_name,
+        rids_to_names,
         query_user,
         lookup_usergroups,
-        msrpc_lookup_useraliases,
+        lookup_useraliases,
         lookup_groupmem,
         sequence_number,
-        msrpc_lockout_policy,
-        msrpc_password_policy,
+        lockout_policy,
+        password_policy,
         trusted_domains,
 };