Changeset 228 for branches/samba-3.2.x/source/winbindd/winbindd_rpc.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/winbindd/winbindd_rpc.c (modified) (7 diffs)

branches/samba-3.2.x/source/winbindd/winbindd_rpc.c

@@ -266 +266 @@
 
 /* convert a single name to a sid in a domain */
-NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
-                           TALLOC_CTX *mem_ctx,
-                           enum winbindd_cmd original_cmd,
-                           const char *domain_name,
-                           const char *name,
-                           DOM_SID *sid,
-                           enum lsa_SidType *type)
+static NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  enum winbindd_cmd original_cmd,
+                                  const char *domain_name,
+                                  const char *name,
+                                  DOM_SID *sid,
+                                  enum lsa_SidType *type)
 {
         NTSTATUS result;
@@ -320 +320 @@
   convert a domain SID to a user or group name
 */
-NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain,
-                            TALLOC_CTX *mem_ctx,
-                            const DOM_SID *sid,
-                            char **domain_name,
-                            char **name,
-                            enum lsa_SidType *type)
+static NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  const DOM_SID *sid,
+                                  char **domain_name,
+                                  char **name,
+                                  enum lsa_SidType *type)
 {
         char **domains;
@@ -363 +363 @@
 }
 
-NTSTATUS msrpc_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)
+static NTSTATUS msrpc_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)
 {
         char **domains;
@@ -603 +603 @@
 }
 
-NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
-                                  TALLOC_CTX *mem_ctx,
-                                  uint32 num_sids, const DOM_SID *sids,
-                                  uint32 *num_aliases, uint32 **alias_rids)
+static NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain,
+                                         TALLOC_CTX *mem_ctx,
+                                         uint32 num_sids, const DOM_SID *sids,
+                                         uint32 *num_aliases,
+                                         uint32 **alias_rids)
 {
         NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -821 +822 @@
 
                 for (r=0; r<tmp_names.count; r++) {
-                        (*names)[i+r] = CONST_DISCARD(char *, tmp_names.names[r].string);
+                        (*names)[i+r] = fill_domain_username_talloc(mem_ctx,
+                                                domain->name,
+                                                tmp_names.names[r].string,
+                                                true);
                         (*name_types)[i+r] = tmp_types.ids[r];
                 }
@@ -1066 +1070 @@
 
 /* find the lockout policy for a domain */
-NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain,
-                              TALLOC_CTX *mem_ctx,
-                              struct samr_DomInfo12 *lockout_policy)
+static NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain,
+                                     TALLOC_CTX *mem_ctx,
+                                     struct samr_DomInfo12 *lockout_policy)
 {
         NTSTATUS result;
@@ -1107 +1111 @@
 
 /* find the password policy for a domain */
-NTSTATUS msrpc_password_policy(struct winbindd_domain *domain,
-                               TALLOC_CTX *mem_ctx,
-                               struct samr_DomInfo1 *password_policy)
+static NTSTATUS msrpc_password_policy(struct winbindd_domain *domain,
+                                      TALLOC_CTX *mem_ctx,
+                                      struct samr_DomInfo1 *password_policy)
 {
         NTSTATUS result;