summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-14 00:12:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:06 -0500
commitd9a5e18ce0480bf99191c20a75216abfef10eab3 (patch)
tree6195e6f157bbe8f3ad1a9c6236ec4042fd89d929
parent803335b0db8ad9ce8972b7d8db8be330fd2ab85d (diff)
downloadsamba-d9a5e18ce0480bf99191c20a75216abfef10eab3.tar.gz
samba-d9a5e18ce0480bf99191c20a75216abfef10eab3.tar.bz2
samba-d9a5e18ce0480bf99191c20a75216abfef10eab3.zip
r23875: As pointed out by mwallnoefer@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 (This used to be commit 923d67ea9d78da46235221375b49b6f1d0d6a862)
-rw-r--r--source4/scripting/libjs/provision.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index c417d7b64b..c0816cc2a5 100644
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -390,18 +390,18 @@ function provision_default_paths(subobj)
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;
}