Changeset 862 for trunk/server/source3/winbindd/winbindd_rpc.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_rpc.c (modified) (8 diffs)

trunk/server/source3/winbindd/winbindd_rpc.c

@@ -872 +872 @@
         /* Copy result into array.  The talloc system will take
            care of freeing the temporary arrays later on. */
-        if (tmp_names.count != tmp_types.count) {
-                return NT_STATUS_UNSUCCESSFUL;
+        if (tmp_names.count != num_names) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+        if (tmp_types.count != num_names) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
         }
 
@@ -879 +882 @@
                 if (tmp_types.ids[r] == SID_NAME_UNKNOWN) {
                         continue;
+                }
+                if (total_names >= num_names) {
+                        break;
                 }
                 names[total_names] = fill_domain_username_talloc(names,
@@ -1034 +1040 @@
 static NTSTATUS rpc_try_lookup_sids3(TALLOC_CTX *mem_ctx,
                                      struct winbindd_domain *domain,
+                                     struct rpc_pipe_client *cli,
                                      struct lsa_SidArray *sids,
                                      struct lsa_RefDomainList **pdomains,
@@ -1039 +1046 @@
 {
         struct lsa_TransNameArray2 lsa_names2;
-        struct lsa_TransNameArray *names;
+        struct lsa_TransNameArray *names = *pnames;
         uint32_t i, count;
-        struct rpc_pipe_client *cli;
         NTSTATUS status, result;
-
-        status = cm_connect_lsa_tcp(domain, talloc_tos(), &cli);
-        if (!NT_STATUS_IS_OK(status)) {
-                domain->can_do_ncacn_ip_tcp = false;
-                return status;
-        }
 
         ZERO_STRUCT(lsa_names2);
@@ -1067 +1067 @@
                 return result;
         }
-        names = TALLOC_ZERO_P(mem_ctx, struct lsa_TransNameArray);
-        if (names == NULL) {
-                return NT_STATUS_NO_MEMORY;
-        }
+        if (sids->num_sids != lsa_names2.count) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
         names->count = lsa_names2.count;
         names->names = talloc_array(names, struct lsa_TranslatedName,
@@ -1082 +1082 @@
                         names->names, &lsa_names2.names[i].name.string);
                 names->names[i].sid_index = lsa_names2.names[i].sid_index;
-        }
-        *pnames = names;
+
+                if (names->names[i].sid_index == UINT32_MAX) {
+                        continue;
+                }
+                if ((*pdomains) == NULL) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+                if (names->names[i].sid_index >= (*pdomains)->count) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+        }
         return result;
 }
@@ -1093 +1102 @@
                          struct lsa_TransNameArray **pnames)
 {
-        struct lsa_TransNameArray *names;
+        struct lsa_TransNameArray *names = *pnames;
         struct rpc_pipe_client *cli = NULL;
         struct policy_handle lsa_policy;
         uint32_t count;
+        uint32_t i;
         NTSTATUS status, result;
 
-        if (domain->can_do_ncacn_ip_tcp) {
-                status = rpc_try_lookup_sids3(mem_ctx, domain, sids,
-                                              pdomains, pnames);
-                if (!NT_STATUS_IS_ERR(status)) {
-                        return status;
-                }
-        }
-
-        status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
+        status = cm_connect_lsat(domain, mem_ctx, &cli, &lsa_policy);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
         }
 
-        names = TALLOC_ZERO_P(mem_ctx, struct lsa_TransNameArray);
-        if (names == NULL) {
-                return NT_STATUS_NO_MEMORY;
-        }
+        if (cli->transport->transport == NCACN_IP_TCP) {
+                return rpc_try_lookup_sids3(mem_ctx, domain, cli, sids,
+                                            pdomains, pnames);
+        }
+
         status = dcerpc_lsa_LookupSids(cli->binding_handle, mem_ctx,
                                        &lsa_policy, sids, pdomains,
@@ -1126 +1129 @@
                 return result;
         }
-        *pnames = names;
+
+        if (sids->num_sids != names->count) {
+                return NT_STATUS_INVALID_NETWORK_RESPONSE;
+        }
+
+        for (i=0; i < names->count; i++) {
+                if (names->names[i].sid_index == UINT32_MAX) {
+                        continue;
+                }
+                if ((*pdomains) == NULL) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+                if (names->names[i].sid_index >= (*pdomains)->count) {
+                        return NT_STATUS_INVALID_NETWORK_RESPONSE;
+                }
+        }
+
         return result;
 }