sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

lib/param: Use server role = 'standalone server' to be consistant with member server

Browse Source 
standalne is left as an alias.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2012-06-11 10:50:08 +10:00
parent 11db5b1f33
commit 67bdf4fa11
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/param/param_enums.c
View File

@ -75,6 +75,7 @@ static const struct enum_list enum_csc_policy[] = {
/* Server role options */ /* Server role options */
static const struct enum_list enum_server_role[] = { static const struct enum_list enum_server_role[] = {
{ROLE_AUTO, "auto"}, {ROLE_AUTO, "auto"},
{ROLE_STANDALONE, "standalone server"},
{ROLE_STANDALONE, "standalone"}, {ROLE_STANDALONE, "standalone"},
{ROLE_DOMAIN_MEMBER, "member server"}, {ROLE_DOMAIN_MEMBER, "member server"},
{ROLE_DOMAIN_MEMBER, "member"}, {ROLE_DOMAIN_MEMBER, "member"},

11
source4/scripting/python/samba/provision/__init__.py
View File

@ -603,7 +603,7 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
netbiosname = determine_netbios_name(hostname) netbiosname = determine_netbios_name(hostname)
if serverrole is None: if serverrole is None:
serverrole = "standalone" serverrole = "standalone server"
if sid_generator is None: if sid_generator is None:
sid_generator = "internal" sid_generator = "internal"
@ -1566,7 +1566,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
_ROLES_MAP = { _ROLES_MAP = {
"ROLE_STANDALONE": "standalone", "ROLE_STANDALONE": "standalone server",
"ROLE_DOMAIN_MEMBER": "member server", "ROLE_DOMAIN_MEMBER": "member server",
"ROLE_DOMAIN_BDC": "active directory domain controller", "ROLE_DOMAIN_BDC": "active directory domain controller",
"ROLE_DOMAIN_PDC": "active directory domain controller", "ROLE_DOMAIN_PDC": "active directory domain controller",
@ -1575,7 +1575,8 @@ _ROLES_MAP = {
"domain controller": "active directory domain controller", "domain controller": "active directory domain controller",
"active directory domain controller": "active directory domain controller", "active directory domain controller": "active directory domain controller",
"member server": "member server", "member server": "member server",
"standalone": "standalone", "standalone": "standalone server",
"standalone server": "standalone server",
} }
@ -1585,7 +1586,7 @@ def sanitize_server_role(role):
:param role: Server role :param role: Server role
:raise ValueError: If the role can not be interpreted :raise ValueError: If the role can not be interpreted
:return: Sanitized server role (one of "member server", :return: Sanitized server role (one of "member server",
"active directory domain controller", "standalone") "active directory domain controller", "standalone server")
""" """
try: try:
return _ROLES_MAP[role] return _ROLES_MAP[role]
@ -1615,7 +1616,7 @@ def provision(logger, session_info, credentials, smbconf=None,
try: try:
serverrole = sanitize_server_role(serverrole) serverrole = sanitize_server_role(serverrole)
except ValueError: except ValueError:
raise ProvisioningError('server role (%s) should be one of "active directory domain controller", "member server", "standalone"' % serverrole) raise ProvisioningError('server role (%s) should be one of "active directory domain controller", "member server", "standalone server"' % serverrole)
if ldapadminpass is None: if ldapadminpass is None:
# Make a new, random password between Samba and it's LDAP server # Make a new, random password between Samba and it's LDAP server

7
source4/scripting/python/samba/tests/provision.py
View File

@ -124,7 +124,8 @@ class Disabled(object):
class SanitizeServerRoleTests(TestCase): class SanitizeServerRoleTests(TestCase):
def test_same(self): def test_same(self):
self.assertEquals("standalone", sanitize_server_role("standalone")) self.assertEquals("standalone server",
sanitize_server_role("standalone server"))
self.assertEquals("member server", self.assertEquals("member server",
sanitize_server_role("member server")) sanitize_server_role("member server"))
@ -132,7 +133,9 @@ class SanitizeServerRoleTests(TestCase):
self.assertRaises(ValueError, sanitize_server_role, "foo") self.assertRaises(ValueError, sanitize_server_role, "foo")
def test_valid(self): def test_valid(self):
self.assertEquals("standalone", sanitize_server_role("ROLE_STANDALONE")) self.assertEquals("standalone server", sanitize_server_role("ROLE_STANDALONE"))
self.assertEquals("standalone server", sanitize_server_role("standalone"))
self.assertEquals("active directory domain controller", sanitize_server_role("domain controller"))
class DummyLogger(object): class DummyLogger(object):