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

[idra at samba.org]

Author: idra
Date: 2007-03-21 21:10:59 +0000 (Wed, 21 Mar 2007)
New Revision: 21919

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

Log:

now that the local passdb abd BUILTIN have been blacklisted and they always
point to the passdb module, remove this comment and move the explanation in
the dimap_ad man page.

Simo.


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


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ad.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_ad.c	2007-03-21 21:08:15 UTC (rev 21918)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ad.c	2007-03-21 21:10:59 UTC (rev 21919)
@@ -194,21 +194,6 @@
 		}
 	}
 
-	/* idmap AD can work well only if it is the default module (trusts)
-	 * with additional BUILTIN and alloc using TDB */
-	if ( ! dom->default_domain) {
-		DEBUG(1, ("WARNING: idmap_ad is not configured as the default domain.\n"
-			  "For best results we suggest you to configure this module as\n"
-			  "default and configure BULTIN to use idmap_tdb\n"
-			  "ex: idmap domains = BUILTIN %s\n"
-			  "    idmap alloc config: range = 5000 - 9999\n"
-			  "    idmap config %s: default = yes\n"
-			  "    idmap config %s: backend = ad\n"
-			  "    idmap config %s: range = 10000 - 10000000  #this is optional\n"
-			  "NOTE: make sure the ranges do not overlap\n",
-			  dom->name, dom->name, dom->name, dom->name));
-	}
-
 	if ( !dom->readonly ) {
 		DEBUG(1, ("WARNING: forcing to readonly, as idmap_ad can't write on AD.\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-03-21 21:08:15 UTC (rev 21918)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ad.c	2007-03-21 21:10:59 UTC (rev 21919)
@@ -194,21 +194,6 @@
 		}
 	}
 
-	/* idmap AD can work well only if it is the default module (trusts)
-	 * with additional BUILTIN and alloc using TDB */
-	if ( ! dom->default_domain) {
-		DEBUG(1, ("WARNING: idmap_ad is not configured as the default domain.\n"
-			  "For best results we suggest you to configure this module as\n"
-			  "default and configure BULTIN to use idmap_tdb\n"
-			  "ex: idmap domains = BUILTIN %s\n"
-			  "    idmap alloc config: range = 5000 - 9999\n"
-			  "    idmap config %s: default = yes\n"
-			  "    idmap config %s: backend = ad\n"
-			  "    idmap config %s: range = 10000 - 10000000  #this is optional\n"
-			  "NOTE: make sure the ranges do not overlap\n",
-			  dom->name, dom->name, dom->name, dom->name));
-	}
-
 	if ( !dom->readonly ) {
 		DEBUG(1, ("WARNING: forcing to readonly, as idmap_ad can't write on AD.\n"));
 		dom->readonly = true;