svn commit: samba r16063 - in branches/SAMBA_4_0/source/scripting/libjs: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-06-06 17:55:41 +0000 (Tue, 06 Jun 2006)
New Revision: 16063

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

Log:
Make is clearer when we can't write to the smb.conf

Find more possible posix group names for the 'domain users' group, as
the existing options don't exist in OSX.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-06-06 17:54:10 UTC (rev 16062)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-06-06 17:55:41 UTC (rev 16063)
@@ -238,7 +238,7 @@
 /*
   setup a file in the private dir
  */
-function setup_file(template, fname, subobj)
+function setup_file(template, message, fname, subobj)
 {
 	var lp = loadparm_init();
 	var f = fname;
@@ -250,7 +250,10 @@
 	data = substitute_var(data, subobj);
 
 	ok = sys.file_save(f, data);
-	assert(ok);
+	if (!ok) {
+		message("failed to create file: " + f + "\n");
+		assert(ok);
+	}
 }
 
 function provision_default_paths(subobj)
@@ -355,7 +358,7 @@
 	var st = sys.stat(paths.smbconf);
 	if (st == undefined) {
 		message("Setting up smb.conf\n");
-		setup_file("provision.smb.conf", paths.smbconf, subobj);
+		setup_file("provision.smb.conf", info.message, paths.smbconf, subobj);
 		lp.reload();
 	}
 	message("Setting up secrets.ldb\n");
@@ -412,7 +415,7 @@
 	assert(subobj.HOSTGUID != undefined);
 
 	setup_file("provision.zone", 
-		   paths.dns, 
+		   message, paths.dns, 
 		   subobj);
 
 	message("Please install the zone located in " + paths.dns + " into your DNS server\n");
@@ -456,7 +459,7 @@
 	subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
-	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other");
+	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown");
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME),