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

jelmer at samba.org jelmer at samba.org
Mon Sep 26 18:15:25 GMT 2005


Author: jelmer
Date: 2005-09-26 18:15:24 +0000 (Mon, 26 Sep 2005)
New Revision: 10515

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

Log:
Handle replacement of "domain logons" and "domain master" by "server role"

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


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-09-26 17:42:12 UTC (rev 10514)
+++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js	2005-09-26 18:15:24 UTC (rev 10515)
@@ -387,11 +387,9 @@
 	"map system",
 	"map hidden",
 	"map archive",
-	"domain logons",
 	"preferred master",
 	"prefered master",
 	"local master",
-	"domain master",
 	"browseable",
 	"browsable",
 	"wins server",
@@ -444,6 +442,20 @@
 		}
 	}
 
+	if (oldconf.get("domain logons") == "True") {
+		if (oldconf.get("domain master") == "True") {
+			newconf.set("role", "pdc");
+		} else {
+			newconf.set("role", "bdc");
+		}
+	} else {
+		if (oldconf.get("domain master") == "True") {
+			newconf.set("role", "standalone");
+		} else {
+			newconf.set("role", "member server");
+		}
+	}
+
 	return newconf;
 }
 



More information about the samba-cvs mailing list