summaryrefslogtreecommitdiff
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
commitca70c3cde7b2068f7665a4bf11359c10e75bc85a (patch)
tree3ca4e0b84a6107ce00f94b5d39450060a8e28c57
parentd4f15433352b9decda2f2a59906aa0f74dac0fb7 (diff)
downloadsamba-ca70c3cde7b2068f7665a4bf11359c10e75bc85a.tar.gz
samba-ca70c3cde7b2068f7665a4bf11359c10e75bc85a.tar.bz2
samba-ca70c3cde7b2068f7665a4bf11359c10e75bc85a.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 (This used to be commit f127803734f9ae16e400b8a91e1e1910fd49b7f3)
-rw-r--r--source3/nsswitch/idmap.c1
-rw-r--r--source3/nsswitch/idmap_ad.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c
index 104be86777..1bd93affac 100644
--- a/source3/nsswitch/idmap.c
+++ b/source3/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/source3/nsswitch/idmap_ad.c b/source3/nsswitch/idmap_ad.c
index 3fb893d94b..5ec543819e 100644
--- a/source3/nsswitch/idmap_ad.c
+++ b/source3/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);