diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-03-02 18:33:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:54 -0500 |
| commit | ae9614ce019e25fb29dad8429d93f3140c2f84ad (patch) | |
| tree | bd5f165afa20746c4c121c03c16e996cf4baced0 | |
| parent | aa85ba4f3799ffbe5c6f84f768f03a4c68d879dc (diff) | |
| download | samba-ae9614ce019e25fb29dad8429d93f3140c2f84ad.tar.gz samba-ae9614ce019e25fb29dad8429d93f3140c2f84ad.tar.xz samba-ae9614ce019e25fb29dad8429d93f3140c2f84ad.zip | |
r13791: Having S-1-1-0 show up in winbind lookupsid does not really make sense.
Volker
| -rw-r--r-- | source/passdb/lookup_sid.c | 10 | ||||
| -rw-r--r-- | source/passdb/util_wellknown.c | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c index 3d1805525a1..942d2771782 100644 --- a/source/passdb/lookup_sid.c +++ b/source/passdb/lookup_sid.c @@ -1191,9 +1191,13 @@ BOOL sid_to_gid(const DOM_SID *psid, gid_t *pgid) goto done; } - if (sid_check_is_in_builtin(psid) && pdb_getgrsid(&map, *psid)) { - *pgid = map.gid; - goto done; + if ((sid_check_is_in_builtin(psid) || + sid_check_is_in_wellknown_domain(psid))) { + if (pdb_getgrsid(&map, *psid)) { + *pgid = map.gid; + goto done; + } + return False; } if (sid_peek_check_rid(get_global_sam_sid(), psid, &rid)) { diff --git a/source/passdb/util_wellknown.c b/source/passdb/util_wellknown.c index be3cf374469..9a6fa7def52 100644 --- a/source/passdb/util_wellknown.c +++ b/source/passdb/util_wellknown.c @@ -85,6 +85,17 @@ BOOL sid_check_is_wellknown_domain(const DOM_SID *sid, const char **name) return False; } +BOOL sid_check_is_in_wellknown_domain(const DOM_SID *sid) +{ + DOM_SID dom_sid; + uint32 rid; + + sid_copy(&dom_sid, sid); + sid_split_rid(&dom_sid, &rid); + + return sid_check_is_wellknown_domain(&dom_sid, NULL); +} + /************************************************************************** Looks up a known username from one of the known domains. ***************************************************************************/ |