diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-02-09 12:57:01 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-02-09 12:57:01 +0100 |
| commit | 4dc2be2264926fe415e4e40e212f94793c9831d1 (patch) | |
| tree | 590b2d720244d3613a89516f1397824fe5630bb6 /source3 | |
| parent | fb0c03209773059caad8d0aad5899828e5f5e64e (diff) | |
| download | samba-4dc2be2264926fe415e4e40e212f94793c9831d1.tar.gz samba-4dc2be2264926fe415e4e40e212f94793c9831d1.tar.bz2 samba-4dc2be2264926fe415e4e40e212f94793c9831d1.zip | |
s3:passdb: only use gid_to_sid() result if the result is a group of our local sam
Otherwise retry with pdb_gid_to_sid().
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_get_set.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index a5f7a0263a..8001bbbae3 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -184,6 +184,7 @@ const DOM_SID *pdb_get_group_sid(struct samu *sampass) { DOM_SID *gsid; struct passwd *pwd; + bool need_lookup_sid = false; /* Return the cached group SID if we have that */ if ( sampass->group_sid ) { @@ -214,10 +215,6 @@ const DOM_SID *pdb_get_group_sid(struct samu *sampass) gid_to_sid(gsid, pwd->pw_gid); if (!is_null_sid(gsid)) { - enum lsa_SidType type = SID_NAME_UNKNOWN; - TALLOC_CTX *mem_ctx; - bool lookup_ret; - const DOM_SID *usid = pdb_get_user_sid(sampass); DOM_SID dgsid; uint32_t rid; @@ -233,8 +230,23 @@ const DOM_SID *pdb_get_group_sid(struct samu *sampass) case DOMAIN_RID_USERS: sampass->group_sid = gsid; return sampass->group_sid; + default: + need_lookup_sid = true; + break; + } + } else { + ZERO_STRUCTP(gsid); + if (pdb_gid_to_sid(pwd->pw_gid, gsid)) { + need_lookup_sid = true; } } + } + + if (need_lookup_sid) { + enum lsa_SidType type = SID_NAME_UNKNOWN; + TALLOC_CTX *mem_ctx; + bool lookup_ret; + const DOM_SID *usid = pdb_get_user_sid(sampass); mem_ctx = talloc_init("pdb_get_group_sid"); if (!mem_ctx) { |