From f7682385826a9ed2f463d794e0c91ba53ddd6a9e Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Tue, 1 Dec 1998 23:51:17 +0000 Subject: ok. unix-nt mapping code issues need to check, when looking up group members, that a group member is a unix user [being mapped to an nt user] FIRST then if that fails check that a group member is a unix group [being mapped to an nt group]. why? because you can have group names in a unix /etc/group file with the same name as users. this _might_ be a problem... (This used to be commit 585d47644d3d709ccdfd5135c5f77166b609eb3b) --- source3/groupdb/aliasunix.c | 4 ++-- source3/groupdb/builtinunix.c | 4 ++-- source3/groupdb/groupunix.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/groupdb') diff --git a/source3/groupdb/aliasunix.c b/source3/groupdb/aliasunix.c index 715e290643..f9b93bbce4 100644 --- a/source3/groupdb/aliasunix.c +++ b/source3/groupdb/aliasunix.c @@ -90,8 +90,8 @@ BOOL get_unixalias_members(struct group *grp, fstrcpy(name, unix_name); - if (!lookupsmbgrpnam(name, &gmep) && - !lookupsmbpwnam (name, &gmep)) + if (!lookupsmbpwnam (name, &gmep) && + !lookupsmbgrpnam(name, &gmep)) { continue; } diff --git a/source3/groupdb/builtinunix.c b/source3/groupdb/builtinunix.c index dc70ffb3dc..3fa28b63ae 100644 --- a/source3/groupdb/builtinunix.c +++ b/source3/groupdb/builtinunix.c @@ -91,8 +91,8 @@ BOOL get_unixbuiltin_members(struct group *grp, fstrcpy(name, unix_name); - if (!lookupsmbgrpnam(name, &gmep) && - !lookupsmbpwnam (name, &gmep)) + if (!lookupsmbpwnam (name, &gmep) && + !lookupsmbgrpnam(name, &gmep)) { continue; } diff --git a/source3/groupdb/groupunix.c b/source3/groupdb/groupunix.c index e5ad029e48..685e8146c0 100644 --- a/source3/groupdb/groupunix.c +++ b/source3/groupdb/groupunix.c @@ -85,8 +85,8 @@ BOOL get_unixgroup_members(struct group *grp, { DOM_NAME_MAP gmep; - if (!lookupsmbgrpnam(unix_name, &gmep) && - !lookupsmbpwnam (unix_name, &gmep)) + if (!lookupsmbpwnam (unix_name, &gmep) && + !lookupsmbgrpnam(unix_name, &gmep)) { continue; } -- cgit