diff options
author | Volker Lendecke <vl@samba.org> | 2011-09-16 15:45:47 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2011-10-15 20:49:17 +0200 |
commit | 5adf3baf87fb7d2848fffc9b7231808e46fc74c4 (patch) | |
tree | faa9778ff00eb65fa70f0025810dd14d86500519 | |
parent | 7a7feaae8ce94626f0e185c177fc2e9ef88d8523 (diff) | |
download | samba-5adf3baf87fb7d2848fffc9b7231808e46fc74c4.tar.gz samba-5adf3baf87fb7d2848fffc9b7231808e46fc74c4.tar.xz samba-5adf3baf87fb7d2848fffc9b7231808e46fc74c4.zip |
s3: Fix bug 8455 -- Samba PDC is looking up only primary user group
group_sids_to_info3 does a sid_peek_check_rid on the domain sid before adding
the rids to the array. If the domain sid is 0x0, then the check will always
fail.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat Sep 17 00:51:27 CEST 2011 on sn-devel-104
(cherry picked from commit 3dcec44f3edbc9c4f1946ead3480f6d01cd53e7a)
(cherry picked from commit 095a8c2c42c8af5563bb7e0657bf2c2806d5da25)
-rw-r--r-- | source3/auth/server_info.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 3190b756c46..c6d68c24d7d 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -438,6 +438,13 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, info3->base.logon_count = pdb_get_logon_count(samu); 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, &num_group_sids); @@ -468,13 +475,6 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx, 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); *_info3 = info3; |