diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-11-10 16:26:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-11-17 00:34:09 +0100 |
| commit | 29cd8ae6fd58bd968958447e1438ff05a3bf4b48 (patch) | |
| tree | 8d03ad690111a051d8d4320bfb4bd7b97fcebdcd /source4/setup | |
| parent | 31ba7af757bc7a872140b6fc91e67dab28c9ac8f (diff) | |
| download | samba-29cd8ae6fd58bd968958447e1438ff05a3bf4b48.tar.gz samba-29cd8ae6fd58bd968958447e1438ff05a3bf4b48.tar.bz2 samba-29cd8ae6fd58bd968958447e1438ff05a3bf4b48.zip | |
s4-provision permit server role to be the ROLE_ strings from s3
Also convert between the aliases in one single place.
Andrew Bartlett
Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 1d847decef..f4f6b10042 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -187,12 +187,7 @@ if not opts.adminpass: lp = sambaopts.get_loadparm() smbconf = lp.configfile -if opts.server_role == "dc": - server_role = "domain controller" -elif opts.server_role == "member": - server_role = "member server" -else: - server_role = opts.server_role +server_role = opts.server_role if server_role is None: server_role = "domain controller" |