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

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 2c26ffcbcf1b489cd944aff756a79017bf212b12..af3951785b8a11f410697dff506468b1fa14ffec 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -461,7 +461,6 @@ sub provision_raw_prepare($$$$$$$$$)
        $ctx->{domain} = $domain;
        $ctx->{realm} = uc($realm);
        $ctx->{dnsname} = lc($realm);
-       $ctx->{sid_generator} = "internal";
 
        $ctx->{functional_level} = $functional_level;
 
@@ -602,11 +601,6 @@ sub provision_raw_step1($$)
        server signing = on
 ";
 
-       if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") {
-               print CONFFILE "
-       sid generator = $ctx->{sid_generator}";
-       }
-
        print CONFFILE "
 
        # Begin extra options
@@ -806,9 +800,6 @@ $extra_smbconf_shares
                $ldap_uri =~ s|/|%2F|g;
                $ldap_uri = "ldapi://$ldap_uri";
                $ctx->{ldap_uri} = $ldap_uri;
-               if ($self->{ldap} eq "fedora-ds") {
-                       $ctx->{sid_generator} = "backend";
-               }
 
                $ctx->{ldap_instance} = lc($ctx->{netbiosname});
        }

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 0ec072c3929b8218b0f9e98f97566081b9f37b4b..0c529c84350994e426664f503081b56ee19fd47f 100644 (file)
--- 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: