diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 763140b..9facd01 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1029,7 +1029,7 @@ def provision(setup_dir, message, session_info, serverrole=serverrole, ldap_backend=ldap_backend, ldap_backend_type=ldap_backend_type) - if lp.get("server role") == "domain controller": + if serverrole == "domain controller": if paths.netlogon is None: message("Existing smb.conf does not have a [netlogon] share, but you are configuring a DC.") message("Please either remove %s or see the template at %s" % @@ -1249,7 +1249,7 @@ def provision_backend(setup_dir=None, message=None, mapping = "schema-map-fedora-ds-1.0" backend_schema = "99_ad.ldif" - slapdcommand="Initailise Fedora DS with: setup-ds.pl --file=%s" % paths.fedoradsinf + slapdcommand="Initialise Fedora DS with: setup-ds.pl --file=%s" % paths.fedoradsinf ldapuser = "--simple-bind-dn=" + names.ldapmanagerdn diff --git a/source4/setup/provision b/source4/setup/provision index c6b3491..55a438c 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -129,7 +129,7 @@ if opts.interactive: else: print "%s: " % (prompt,), return sys.stdin.readline().rstrip("\n") or default - opts.realm = ask("Realm", socket.gethostname().split(".", 1)[1].upper()) + opts.realm = ask("Realm", socket.getfqdn().split(".", 1)[1].upper()) opts.domain = ask("Domain", opts.realm.split(".")[0]) opts.server_role = ask("Server Role (dc, member, standalone)", "dc") for i in range(3):