summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-04-03 00:01:34 +0200
committerKai Blin <kai@samba.org>2008-04-03 00:01:34 +0200
commitc26387a473fd26ac51c74c001b520d7fd7d353ec (patch)
tree40df45aa5eb39b051eb7b83351bab48026548fa2
parent110a4ca9e442b383f8483e079e0cc3b936502103 (diff)
downloadsamba-c26387a473fd26ac51c74c001b520d7fd7d353ec.tar.gz
samba-c26387a473fd26ac51c74c001b520d7fd7d353ec.tar.bz2
samba-c26387a473fd26ac51c74c001b520d7fd7d353ec.zip
provision: Remove backup group mapping
Some distros seem to neither have a backup nor a staff group. (This used to be commit 21fcf7c419658b3ae296428ca7a4ccf2288c17fe)
-rw-r--r--source4/scripting/python/samba/provision.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a8ced61c4b..6917aa1a54 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -399,7 +399,7 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
return lp
def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
- users_gid, wheel_gid, backup_gid):
+ users_gid, wheel_gid):
"""setup reasonable name mappings for sam names to unix names.
:param samdb: SamDB object.
@@ -409,8 +409,7 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
:param root_uid: uid of the UNIX root user.
:param nobody_uid: uid of the UNIX nobody user.
:param users_gid: gid of the UNIX users group.
- :param wheel_gid: gid of the UNIX wheel group.
- :param backup_gid: gid of the UNIX backup 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")
@@ -420,7 +419,6 @@ def setup_name_mappings(samdb, idmap, sid, domaindn, root_uid, nobody_uid,
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("S-1-5-32-551", idmap.TYPE_GID, backup_gid)
idmap.setup_name_mapping(sid + "-500", idmap.TYPE_UID, root_uid)
idmap.setup_name_mapping(sid + "-513", idmap.TYPE_GID, users_gid)
@@ -927,10 +925,6 @@ def provision(setup_dir, message, session_info,
wheel_gid = findnss(grp.getgrnam, ["wheel", "adm"])[2]
else:
wheel_gid = findnss(grp.getgrnam, [wheel])[2]
- if backup is None:
- backup_gid = findnss(grp.getgrnam, ["backup", "staff"])[2]
- else:
- backup_gid = findnss(grp.getgrnam, [backup])[2]
if aci is None:
aci = "# no aci for local ldb"
@@ -1023,8 +1017,7 @@ def provision(setup_dir, message, session_info,
if samdb_fill == FILL_FULL:
setup_name_mappings(samdb, idmap, str(domainsid), names.domaindn,
root_uid=root_uid, nobody_uid=nobody_uid,
- users_gid=users_gid, wheel_gid=wheel_gid,
- backup_gid=backup_gid)
+ users_gid=users_gid, wheel_gid=wheel_gid)
message("Setting up sam.ldb rootDSE marking as synchronized")
setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))