diff options
| -rw-r--r-- | source4/scripting/libjs/provision.js | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js index 59bc9cac30..ef6fe31285 100644 --- a/source4/scripting/libjs/provision.js +++ b/source4/scripting/libjs/provision.js @@ -526,6 +526,8 @@ function valid_netbios_name(name) function provision_validate(subobj, message) { + var lp = loadparm_init(); + if (!valid_netbios_name(subobj.DOMAIN)) { message("Invalid NetBIOS name for domain\n"); return false; @@ -536,6 +538,19 @@ function provision_validate(subobj, message) return false; } + + if (lp.get("workgroup") != subobj.DOMAIN) { + message("workgroup '%s' in smb.conf must match chosen domain '%s'\n", + lp.get("workgroup"), subobj.DOMAIN); + return false; + } + + if (lp.get("realm") != subobj.REALM) { + message("realm '%s' in smb.conf must match chosen realm '%s'\n", + lp.get("realm"), subobj.REALM); + return false; + } + return true; } @@ -547,7 +562,7 @@ function join_domain(domain, netbios_name, join_type, creds, message) joindom.join_type = join_type; joindom.netbios_name = netbios_name; if (!ctx.JoinDomain(joindom)) { - message("Domain Join failed: " + join.error_string); + message("Domain Join failed: " + joindom.error_string); return false; } return true; |