sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-25 00:59:11 +03:00
Code Activity

Move some samdb-specific code out of provision.

Browse Source
This commit is contained in:
Jelmer Vernooij
2009-02-11 18:31:52 +01:00
parent d9e94bf336
commit ddb4db7c65
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/scripting/python/samba/provision.py
View File

@ -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.

8
source4/scripting/python/samba/samdb.py
View File

@ -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.