svn commit: samba r9827 - in branches/SAMBA_4_0/source: lib/samba3 script/tests scripting/libjs

[jelmer at samba.org]

Author: jelmer
Date: 2005-08-31 14:27:17 +0000 (Wed, 31 Aug 2005)
New Revision: 9827

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

Log:
Convert 'passdb backend' rather then 'passdb backends'
Be a bit more verbose

Modified:
   branches/SAMBA_4_0/source/lib/samba3/samba3.c
   branches/SAMBA_4_0/source/script/tests/test_s3upgrade.sh
   branches/SAMBA_4_0/source/scripting/libjs/upgrade.js


Changeset:
Modified: branches/SAMBA_4_0/source/lib/samba3/samba3.c
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/samba3.c	2005-08-31 14:26:20 UTC (rev 9826)
+++ branches/SAMBA_4_0/source/lib/samba3/samba3.c	2005-08-31 14:27:17 UTC (rev 9827)
@@ -37,7 +37,7 @@
 	char *dbfile;
 	NTSTATUS status = NT_STATUS_OK;
 	int i;
-	const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backends", NULL);
+	const char **backends = param_get_string_list(samba3->configuration, NULL, "passdb backend", NULL);
 
 	/* Default to smbpasswd */
 	if (backends == NULL) 
@@ -45,6 +45,7 @@
 	else
 		backends = str_list_copy(ctx, backends);
 
+
 	for (i = 0; backends[i]; i++) {
 		if (!strncmp(backends[i], "tdbsam", strlen("tdbsam"))) {
 			const char *p = strchr(backends[i], ':');

Modified: branches/SAMBA_4_0/source/script/tests/test_s3upgrade.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_s3upgrade.sh	2005-08-31 14:26:20 UTC (rev 9826)
+++ branches/SAMBA_4_0/source/script/tests/test_s3upgrade.sh	2005-08-31 14:27:17 UTC (rev 9827)
@@ -3,7 +3,7 @@
 
 if [ -z "$PREFIX" ]
 then
-	print "Usage: test_s3upgrade.sh <prefix"
+	echo "Usage: test_s3upgrade.sh <prefix>"
 	exit 1
 fi
 

Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-08-31 14:26:20 UTC (rev 9826)
+++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-08-31 14:27:17 UTC (rev 9827)
@@ -422,7 +422,7 @@
 
 	// figure out ldapurl, if applicable
 	var ldapurl = undefined;
-	var pdb = samba3.configuration.get_list("passdb backends");
+	var pdb = samba3.configuration.get_list("passdb backend");
 	if (pdb != undefined) {
 		for (var b in pdb) {
 			if (substr(pdb[b], 0, 7) == "ldapsam") {
@@ -438,6 +438,7 @@
 
 	// Enable samba3sam module if original passdb backend was ldap
 	if (ldapurl != undefined) {
+		message("Enabling Samba3 LDAP mappings for SAM database\n");
 		var ldif = sprintf("
 dn: @MAP=samba3sam
 @MAP_URL: %s", ldapurl);