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...

diff --git a/source/groupdb/aliasunix.c b/source/groupdb/aliasunix.c
index 715e2906438fb14e1a1d3731d58fc6b77bd96a50..f9b93bbce439ee17e2d761e478817520e4fdcd40 100644 (file)
--- a/source/groupdb/aliasunix.c
+++ b/source/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/source/groupdb/builtinunix.c b/source/groupdb/builtinunix.c
index dc70ffb3dcb0d9fe6a4bd4cecb4b0efdb09a1dde..3fa28b63aeacab143a8d822ff20f001756f1d50e 100644 (file)
--- a/source/groupdb/builtinunix.c
+++ b/source/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/source/groupdb/groupunix.c b/source/groupdb/groupunix.c
index e5ad029e48a02cb87966e975ff764cfe22c36b76..685e8146c024b67558e94090857aba762d176d9b 100644 (file)
--- a/source/groupdb/groupunix.c
+++ b/source/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;
                }