diff options
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 32 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/samdb.py | 16 |
2 files changed, 24 insertions, 24 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index c029bea848..026e85dfdc 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -474,33 +474,18 @@ 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.""" - def add_foreign(self, domaindn, sid, desc): - """Add a foreign security principle.""" - add = """ +def add_foreign(self, domaindn, sid, desc): + """Add a foreign security principle.""" + add = """ dn: CN=%s,CN=ForeignSecurityPrincipals,%s objectClass: top objectClass: foreignSecurityPrincipal description: %s """ % (sid, domaindn, desc) - # deliberately ignore errors from this, as the records may - # already exist - for msg in self.parse_ldif(add): - self.add(msg[1]) - - # add some foreign sids - add_foreign(samdb, domaindn, "S-1-5-7", "Anonymous") - add_foreign(samdb, domaindn, "S-1-1-0", "World") - add_foreign(samdb, domaindn, "S-1-5-2", "Network") - add_foreign(samdb, domaindn, "S-1-5-18", "System") - add_foreign(samdb, domaindn, "S-1-5-11", "Authenticated Users") - - - 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) - - idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid) - idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid) - + # deliberately ignore errors from this, as the records may + # already exist + for msg in self.parse_ldif(add): + self.add(msg[1]) def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info, credentials, names, @@ -818,6 +803,9 @@ def setup_samdb(path, setup_path, session_info, credentials, lp, names=names, ldap_backend=ldap_backend, serverrole=serverrole) + if (schema == None): + schema = Schema(setup_path, schemadn=names.schemadn, serverdn=names.serverdn) + # Load the database, but importantly, use Ldb not SamDB as we don't want to load the global schema samdb = Ldb(session_info=session_info, credentials=credentials, lp=lp) diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py index ab5e59545b..12618c90ce 100644 --- a/source4/scripting/python/samba/tests/samdb.py +++ b/source4/scripting/python/samba/tests/samdb.py @@ -19,7 +19,7 @@ from samba.auth import system_session from samba.credentials import Credentials import os -from samba.provision import setup_samdb, guess_names, setup_templatesdb, make_smbconf, find_setup_dir +from samba.provision import setup_samdb, guess_names, setup_templatesdb, make_smbconf, find_setup_dir, add_foreign from samba.samdb import SamDB from samba.tests import TestCaseInTempDir from samba.dcerpc import security @@ -92,5 +92,17 @@ class SamDBTests(SamDBTestCase): """Tests for the SamDB implementation.""" def test_add_foreign(self): - self.samdb.add_foreign(self.domaindn, "S-1-5-7", "Somedescription") + add_foreign(self.samdb, self.domaindn, "S-1-5-7", "Anonymous") + add_foreign(self.samdb, self.domaindn, "S-1-1-0", "World") + add_foreign(self.samdb, self.domaindn, "S-1-5-2", "Network") + add_foreign(self.samdb, self.domaindn, "S-1-5-18", "System") + add_foreign(self.samdb, self.domaindn, "S-1-5-11", "Authenticated Users") + +# I don't think these should be here ... +# 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) +# +# idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid) +# idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid) + |