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

[abartlet at samba.org]

Author: abartlet
Date: 2007-07-14 00:12:25 +0000 (Sat, 14 Jul 2007)
New Revision: 23875

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

Log:
As pointed out by mwallnoefer at yahoo.de:
On default Active Directory installations, the NETLOGON share isn't
an indipendent directory. In fact it's mapped to the subdirectory
"scripts" from the share SYSVOL under <Domain name>.

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	2007-07-13 23:38:19 UTC (rev 23874)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-07-14 00:12:25 UTC (rev 23875)
@@ -390,18 +390,18 @@
 	paths.ldap_config_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-config.ldif";
 	paths.ldap_schema_basedn_ldif = paths.ldapdir + "/" + subobj.DNSDOMAIN + "-schema.ldif";
 
-	paths.netlogon = lp.get("netlogon", "path");
-	
-	if (paths.netlogon == undefined) {
-		paths.netlogon = lp.get("lock dir") + "/netlogon";
-	}
-
 	paths.sysvol = lp.get("sysvol", "path");
 
 	if (paths.sysvol == undefined) {
 		paths.sysvol = lp.get("lock dir") + "/sysvol";
 	}
 	
+	paths.netlogon = lp.get("netlogon", "path");
+	
+	if (paths.netlogon == undefined) {
+		paths.netlogon = paths.sysvol + "/" + subobj.DNSDOMAIN + "/scripts";
+	}
+
 	return paths;
 }