svn commit: samba r12936 - branches/SAMBA_3_0/source/sam trunk/source/sam

[lmuelle at samba.org]

Author: lmuelle
Date: 2006-01-14 15:25:33 +0000 (Sat, 14 Jan 2006)
New Revision: 12936

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

Log:
Fix bug #3264.

If we detect a leading 'idmap_' for the idmap backend setting we strip
this and inform about the deprecated config with DEBUG 0.

I'm not sure if we should set a TTL of one year or five additional
releases from now for this code.

This is required for the changes G?\195?\188nther made as the first step to solve
bug #3264.  With this fix we can even run with an old config.  This is
very important as we else will break existing configurations with an
update.

Modified:
   branches/SAMBA_3_0/source/sam/idmap.c
   trunk/source/sam/idmap.c


Changeset:
Modified: branches/SAMBA_3_0/source/sam/idmap.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap.c	2006-01-14 12:37:25 UTC (rev 12935)
+++ branches/SAMBA_3_0/source/sam/idmap.c	2006-01-14 15:25:33 UTC (rev 12936)
@@ -128,6 +128,12 @@
 			pparams++;
 			fstrcpy( params, pparams );
 		}
+
+		/* strip any leading idmap_ prefix of */
+		if ( strncmp( rem_backend, "idmap_", 6) == 0 ) {
+			rem_backend += 6;
+			DEBUG(0, ("idmap_init: idmap backend uses deprecated 'idmap_' prefix.  Please replace 'idmap_%s' by '%s' in %s\n", rem_backend, rem_backend, dyn_CONFIGFILE));
+		}
 		
 		DEBUG(3, ("idmap_init: using '%s' as remote backend\n", rem_backend));
 		

Modified: trunk/source/sam/idmap.c
===================================================================
--- trunk/source/sam/idmap.c	2006-01-14 12:37:25 UTC (rev 12935)
+++ trunk/source/sam/idmap.c	2006-01-14 15:25:33 UTC (rev 12936)
@@ -128,6 +128,12 @@
 			pparams++;
 			fstrcpy( params, pparams );
 		}
+
+		/* strip any leading idmap_ prefix of */
+		if ( strncmp( rem_backend, "idmap_", 6) == 0 ) {
+			rem_backend += 6;
+			DEBUG(0, ("idmap_init: idmap backend uses deprecated 'idmap_' prefix.  Please replace 'idmap_%s' by '%s' in %s\n", rem_backend, rem_backend, dyn_CONFIGFILE));
+		}
 		
 		DEBUG(3, ("idmap_init: using '%s' as remote backend\n", rem_backend));