summaryrefslogtreecommitdiff
path: root/source3/groupdb
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-12-01 23:51:17 +0000
committerLuke Leighton <lkcl@samba.org>1998-12-01 23:51:17 +0000
commitf7682385826a9ed2f463d794e0c91ba53ddd6a9e (patch)
treead5c37ea054797f6a3a23b7f157e68b7dc360f04 /source3/groupdb
parent08cdea519c692de092ba7a70664411c1a3cedac0 (diff)
downloadsamba-f7682385826a9ed2f463d794e0c91ba53ddd6a9e.tar.gz
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)
Diffstat (limited to 'source3/groupdb')
-rw-r--r--source3/groupdb/aliasunix.c4
-rw-r--r--source3/groupdb/builtinunix.c4
-rw-r--r--source3/groupdb/groupunix.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/groupdb/aliasunix.c b/source3/groupdb/aliasunix.c
index 715e2906438..f9b93bbce43 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 dc70ffb3dcb..3fa28b63aea 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 e5ad029e48a..685e8146c02 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;
}