svn commit: samba r22109 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[idra at samba.org]

Author: idra
Date: 2007-04-06 19:55:45 +0000 (Fri, 06 Apr 2007)
New Revision: 22109

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22109

Log:

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


Modified:
   branches/SAMBA_3_0/source/nsswitch/idmap.c
   branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap.c	2007-04-06 19:38:35 UTC (rev 22108)
+++ branches/SAMBA_3_0/source/nsswitch/idmap.c	2007-04-06 19:55:45 UTC (rev 22109)
@@ -407,6 +407,7 @@
 
 		/* 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;
 		}
 

Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_ad.c	2007-04-06 19:38:35 UTC (rev 22108)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ad.c	2007-04-06 19:55:45 UTC (rev 22109)
@@ -194,11 +194,6 @@
 		}
 	}
 
-	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);

Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap.c	2007-04-06 19:38:35 UTC (rev 22108)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap.c	2007-04-06 19:55:45 UTC (rev 22109)
@@ -407,6 +407,7 @@
 
 		/* 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;
 		}
 

Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c	2007-04-06 19:38:35 UTC (rev 22108)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c	2007-04-06 19:55:45 UTC (rev 22109)
@@ -194,11 +194,6 @@
 		}
 	}
 
-	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);