summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2007-04-06 19:55:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:13 -0500
commitf127803734f9ae16e400b8a91e1e1910fd49b7f3 (patch)
tree9f07e76c2b3c9497fd2e4cfbf351b41c57b86857
parent4de297112b9d87e58d870889007001169265e084 (diff)
downloadsamba-f127803734f9ae16e400b8a91e1e1910fd49b7f3.tar.gz
samba-f127803734f9ae16e400b8a91e1e1910fd49b7f3.tar.xz
samba-f127803734f9ae16e400b8a91e1e1910fd49b7f3.zip
r22109: Readonly is automatically set in the generic init code, let's just log the fact there
and remove the specific, but redundant, code in idmap_ad.c
-rw-r--r--source/nsswitch/idmap.c1
-rw-r--r--source/nsswitch/idmap_ad.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c
index 104be86777f..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;
}
diff --git a/source/nsswitch/idmap_ad.c b/source/nsswitch/idmap_ad.c
index 3fb893d94b7..5ec543819ef 100644
--- a/source/nsswitch/idmap_ad.c
+++ b/source/nsswitch/idmap_ad.c
@@ -194,11 +194,6 @@ static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom, const char *params
}
}
- if ( !dom->readonly ) {
- DEBUG(1, ("WARNING: forcing to readonly, as idmap_ad can't write on AD.\n"));
- dom->readonly = true;
- }
-
dom->private_data = ctx;
talloc_free(config_option);