summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-09-09 12:15:36 +1200
committerStefan Metzmacher <metze@samba.org>2013-09-16 23:33:40 +0200
commitef830f7e7107cd5287903d83519588c9d31b526f (patch)
treee7d543d5ba4061f9945a26baae48285bdbd6d81b
parentf75dc8f4a54581ed207e7caa2e52211ea24e3554 (diff)
downloadsamba-ef830f7e7107cd5287903d83519588c9d31b526f.tar.gz
samba-ef830f7e7107cd5287903d83519588c9d31b526f.tar.bz2
samba-ef830f7e7107cd5287903d83519588c9d31b526f.zip
samba-tool domain join: Set server role correctly to "active directory domain controller"
We changed the magic string when we reworked the list of server roles. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Mon Sep 16 23:33:41 CEST 2013 on sn-devel-104
-rw-r--r--python/samba/join.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/join.py b/python/samba/join.py
index ab5b53285d..15db67fbb4 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -723,7 +723,7 @@ class dc_join(object):
schemadn=ctx.schema_dn, configdn=ctx.config_dn,
serverdn=ctx.server_dn, domain=ctx.domain_name,
hostname=ctx.myname, domainsid=ctx.domsid,
- machinepass=ctx.acct_pass, serverrole="domain controller",
+ machinepass=ctx.acct_pass, serverrole="active directory domain controller",
sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid,
use_ntvfs=ctx.use_ntvfs, dns_backend=ctx.dns_backend)
print "Provision OK for domain DN %s" % presult.domaindn
@@ -767,7 +767,7 @@ class dc_join(object):
ctx.logger, ctx.names, ctx.paths, domainsid=security.dom_sid(ctx.domsid),
domainguid=domguid,
targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN,
- machinepass=ctx.acct_pass, serverrole="domain controller",
+ machinepass=ctx.acct_pass, serverrole="active directory domain controller",
lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6,
dns_backend=ctx.dns_backend, adminpass=ctx.adminpass)
print("Provision OK for domain %s" % ctx.names.dnsdomain)