r22109: Readonly is automatically set in the generic init code, let's just log the...

and remove the specific, but redundant, code in idmap_ad.c
(This used to be commit f127803734f9ae16e400b8a91e1e1910fd49b7f3)

diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c
index 104be86777fb2d693ca32e530261532ab87471e2..1bd93affac86236b0a87a326b15d969fd95452c3 100644 (file)
--- 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 3fb893d94b7f3fa3b9f098f8d4f544a59f4e65af..5ec543819ef6fe3e6f66062720fd02355f046626 100644 (file)
--- 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);