diff options
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 8 | ||||
| -rw-r--r-- | source4/scripting/python/samba/samdb.py | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 91cc074031..1d7011d305 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -394,7 +394,6 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, }) - def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid, users_gid, wheel_gid): """setup reasonable name mappings for sam names to unix names. @@ -408,11 +407,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid, :param users_gid: gid of the UNIX users group. :param wheel_gid: gid of the UNIX wheel group.""" # add some foreign sids if they are not present already - samdb.add_foreign(domaindn, "S-1-5-7", "Anonymous") - samdb.add_foreign(domaindn, "S-1-1-0", "World") - samdb.add_foreign(domaindn, "S-1-5-2", "Network") - samdb.add_foreign(domaindn, "S-1-5-18", "System") - samdb.add_foreign(domaindn, "S-1-5-11", "Authenticated Users") + samdb.add_stock_foreign_sids() idmap.setup_name_mapping("S-1-5-7", idmap.TYPE_UID, nobody_uid) idmap.setup_name_mapping("S-1-5-32-544", idmap.TYPE_GID, wheel_gid) @@ -1423,6 +1418,7 @@ def provision_backend(setup_dir=None, message=None, "--server-role='" + serverrole + "'"] message("Run provision with: " + " ".join(args)) + def create_phpldapadmin_config(path, setup_path, ldapi_uri): """Create a PHP LDAP admin configuration file. diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 947c46079f..9cc55e5629 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -65,6 +65,14 @@ description: %s for msg in self.parse_ldif(add): self.add(msg[1]) + def add_stock_foreign_sids(self): + domaindn = self.domain_dn() + self.add_foreign(domaindn, "S-1-5-7", "Anonymous") + self.add_foreign(domaindn, "S-1-1-0", "World") + self.add_foreign(domaindn, "S-1-5-2", "Network") + self.add_foreign(domaindn, "S-1-5-18", "System") + self.add_foreign(domaindn, "S-1-5-11", "Authenticated Users") + def enable_account(self, user_dn): """Enable an account. |