summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-20 11:48:11 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-20 16:22:41 +1000
commit706a998c1fd0f384a51901e2d0a179e54d48f169 (patch)
treef3dfc1cd9e4f25d744689814d50830d334843e24 /source4/scripting/python
parent7f498f8987434b942718c139ec660fc2924238b0 (diff)
downloadsamba-706a998c1fd0f384a51901e2d0a179e54d48f169.tar.gz
samba-706a998c1fd0f384a51901e2d0a179e54d48f169.tar.bz2
samba-706a998c1fd0f384a51901e2d0a179e54d48f169.zip
s4-provision: Remove last unused remenants of the 'sid generator' configuration
This was part of the now-abandoned S4 AD LDAP backend project. Andrew Bartlett
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 0ec072c392..0c529c8435 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -591,7 +591,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
def make_smbconf(smbconf, hostname, domain, realm, targetdir,
- serverrole=None, sid_generator=None, eadb=False, use_ntvfs=False, lp=None,
+ serverrole=None, eadb=False, use_ntvfs=False, lp=None,
global_param=None):
"""Create a new smb.conf file based on a couple of basic settings.
"""
@@ -605,9 +605,6 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir,
if serverrole is None:
serverrole = "standalone server"
- if sid_generator is None:
- sid_generator = "internal"
-
assert domain is not None
domain = domain.upper()
@@ -1630,10 +1627,6 @@ def provision(logger, session_info, credentials, smbconf=None,
else:
domainsid = security.dom_sid(domainsid)
- sid_generator = "internal"
- if backend_type == "fedora-ds":
- sid_generator = "backend"
-
root_uid = findnss_uid([root or "root"])
nobody_uid = findnss_uid([nobody or "nobody"])
users_gid = findnss_gid([users or "users", 'users', 'other', 'staff'])
@@ -1679,11 +1672,11 @@ def provision(logger, session_info, credentials, smbconf=None,
if data is None or data == "":
make_smbconf(smbconf, hostname, domain, realm,
targetdir, serverrole=serverrole,
- sid_generator=sid_generator, eadb=useeadb, use_ntvfs=use_ntvfs,
+ eadb=useeadb, use_ntvfs=use_ntvfs,
lp=lp, global_param=global_param)
else:
make_smbconf(smbconf, hostname, domain, realm, targetdir,
- serverrole=serverrole, sid_generator=sid_generator,
+ serverrole=serverrole,
eadb=useeadb, use_ntvfs=use_ntvfs, lp=lp, global_param=global_param)
if lp is None: