Changeset 751 for trunk/server/source3/auth/server_info.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/auth/server_info.c (modified) (6 diffs)

trunk/server/source3/auth/server_info.c

@@ -274 +274 @@
                 ok = sid_peek_check_rid(domain_sid, &sids[i], &rid);
                 if (ok) {
-
-                        /* if it is the primary gid, skip it, we
-                         * obviously already have it */
-                        if (info3->base.primary_gid == rid) continue;
-
                         /* store domain group rid */
-                        groups->rids[i].rid = rid;
-                        groups->rids[i].attributes = attributes;
+                        groups->rids[groups->count].rid = rid;
+                        groups->rids[groups->count].attributes = attributes;
                         groups->count++;
                         continue;
@@ -439 +434 @@
         info3->base.bad_password_count = pdb_get_bad_password_count(samu);
 
+        info3->base.domain.string = talloc_strdup(info3,
+                                                  pdb_get_domain(samu));
+        RET_NOMEM(info3->base.domain.string);
+
+        info3->base.domain_sid = dom_sid_dup(info3, &domain_sid);
+        RET_NOMEM(info3->base.domain_sid);
+
         status = pdb_enum_group_memberships(mem_ctx, samu,
                                             &group_sids, &gids,
@@ -468 +470 @@
                 RET_NOMEM(info3->base.logon_server.string);
         }
-
-        info3->base.domain.string = talloc_strdup(info3,
-                                                  pdb_get_domain(samu));
-        RET_NOMEM(info3->base.domain.string);
-
-        info3->base.domain_sid = dom_sid_dup(info3, &domain_sid);
-        RET_NOMEM(info3->base.domain_sid);
 
         info3->base.acct_flags = pdb_get_acct_ctrl(samu);
@@ -530 +525 @@
                                 size_t num_sids)
 {
-        unsigned int i;
+        unsigned int i, j = 0;
         bool ok;
 
@@ -543 +538 @@
                 ok = sid_peek_check_rid(domain_sid,
                                         (const struct dom_sid *)&sids[i].sid,
-                                        &groups->rids[i].rid);
+                                        &groups->rids[j].rid);
                 if (!ok) continue;
 
-                groups->rids[i].attributes = SE_GROUP_MANDATORY |
+                groups->rids[j].attributes = SE_GROUP_MANDATORY |
                                              SE_GROUP_ENABLED_BY_DEFAULT |
                                              SE_GROUP_ENABLED;
-                groups->count++;
-        }
-
+                j++;
+        }
+
+        groups->count = j;
+        return NT_STATUS_OK;
+}
+
+static NTSTATUS wbcsids_to_netr_SidAttrArray(
+                                const struct dom_sid *domain_sid,
+                                const struct wbcSidWithAttr *sids,
+                                size_t num_sids,
+                                TALLOC_CTX *mem_ctx,
+                                struct netr_SidAttr **_info3_sids,
+                                uint32_t *info3_num_sids)
+{
+        unsigned int i, j = 0;
+        struct netr_SidAttr *info3_sids;
+
+        info3_sids = talloc_array(mem_ctx, struct netr_SidAttr, num_sids);
+        if (info3_sids == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        /* a wbcDomainSid is the same as a dom_sid */
+        for (i = 0; i < num_sids; i++) {
+                const struct dom_sid *sid;
+
+                sid = (const struct dom_sid *)&sids[i].sid;
+
+                if (dom_sid_in_domain(domain_sid, sid)) {
+                        continue;
+                }
+
+                info3_sids[j].sid = dom_sid_dup(info3_sids, sid);
+                if (info3_sids[j].sid == NULL) {
+                        talloc_free(info3_sids);
+                        return NT_STATUS_NO_MEMORY;
+                }
+                info3_sids[j].attributes = SE_GROUP_MANDATORY |
+                                           SE_GROUP_ENABLED_BY_DEFAULT |
+                                           SE_GROUP_ENABLED;
+                j++;
+        }
+
+        *info3_num_sids = j;
+        *_info3_sids = info3_sids;
         return NT_STATUS_OK;
 }
@@ -637 +675 @@
         }
 
+        status = wbcsids_to_netr_SidAttrArray(&domain_sid,
+                                              &info->sids[1],
+                                              info->num_sids - 1,
+                                              info3,
+                                              &info3->sids,
+                                              &info3->sidcount);
+        if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(info3);
+                return NULL;
+        }
+
         info3->base.user_flags = info->user_flags;
         memcpy(info3->base.key.key, info->user_session_key, 16);