summaryrefslogtreecommitdiffstats
path: root/source/nsswitch/idmap.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-04-09 16:04:07 +0000
committerGerald Carter <jerry@samba.org>2007-04-09 16:04:07 +0000
commit7dcb89c1236f9712f9018744bea2e016b5cdfab9 (patch)
tree69b6dd928b31818c82a7368be3cff169cc8b8a61 /source/nsswitch/idmap.c
parent099d375891d4444320bd451486e8bf7d9afdbe0f (diff)
downloadsamba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.tar.gz
samba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.tar.xz
samba-7dcb89c1236f9712f9018744bea2e016b5cdfab9.zip
r22138: * Sync up with the SAMBA_3_0_25 as of svn r22132.
* Set VERSION to 3.0.25rc1 * Update release notes.
Diffstat (limited to 'source/nsswitch/idmap.c')
-rw-r--r--source/nsswitch/idmap.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c
index c2a38fa9797..1bd93affac8 100644
--- a/source/nsswitch/idmap.c
+++ b/source/nsswitch/idmap.c
@@ -407,6 +407,7 @@ NTSTATUS idmap_init(void)
/* check the set_mapping function exists otherwise mark the module as readonly */
if ( ! dom->methods->set_mapping) {
+ DEBUG(5, ("Forcing to readonly, as ithis module can't store arbitrary mappings.\n"));
dom->readonly = True;
}
@@ -689,7 +690,9 @@ static struct idmap_domain* find_idmap_domain_from_sid( DOM_SID *account_sid )
if ( (pdb_dom_num != -1) &&
(sid_check_is_in_builtin(account_sid) ||
- sid_check_is_in_wellknown_domain(account_sid)) )
+ sid_check_is_in_wellknown_domain(account_sid) ||
+ sid_check_is_in_unix_groups(account_sid) ||
+ sid_check_is_in_unix_users(account_sid)) )
{
return idmap_domains[pdb_dom_num];
}