1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-22 16:59:09 +03:00

Add tests for findnss(), add some docstrings.

(This used to be commit 4eec2bbc9a)
This commit is contained in:
Jelmer Vernooij
2008-02-09 02:10:49 +01:00
parent c1d8ac0ab1
commit 2aac2a5df8
2 changed files with 48 additions and 14 deletions

View File

@ -81,14 +81,19 @@ def check_install(lp, session_info, credentials):
raise "No administrator account found"
def findnss(nssfn, *names):
"""Find a user or group from a list of possibilities."""
def findnss(nssfn, names):
"""Find a user or group from a list of possibilities.
:param nssfn: NSS Function to try (should raise KeyError if not found)
:param names: Names to check.
:return: Value return by first names list.
"""
for name in names:
try:
return nssfn(name)
except KeyError:
pass
raise Exception("Unable to find user/group for %s" % arguments[1])
raise KeyError("Unable to find user/group %r" % names)
def open_ldb(session_info, credentials, lp, dbname):
@ -146,6 +151,14 @@ def setup_modify_ldif(ldb, ldif_path, substvars=None):
def setup_ldb(ldb, ldif_path, subst_vars):
"""Import a LDIF a file into a LDB handle, optionally substituting variables.
:note: Either all LDIF data will be added or none (using transactions).
:param ldb: LDB file to import into.
:param ldif_path: Path to the LDIF file.
:param subst_vars: Dictionary with substitution variables.
"""
assert ldb is not None
ldb.transaction_start()
try:
@ -716,18 +729,18 @@ def provision(lp, setup_dir, message, paths, session_info,
if dnspass is None:
dnspass = misc.random_password(12)
if root is None:
root = findnss(pwd.getpwnam, "root")[0]
root = findnss(pwd.getpwnam, ["root"])[0]
if nobody is None:
nobody = findnss(pwd.getpwnam, "nobody")[0]
nobody = findnss(pwd.getpwnam, ["nobody"])[0]
if nogroup is None:
nogroup = findnss(grp.getgrnam, "nogroup", "nobody")[0]
nogroup = findnss(grp.getgrnam, ["nogroup", "nobody"])[0]
if users is None:
users = findnss(grp.getgrnam, "users", "guest", "other", "unknown",
"usr")[0]
users = findnss(grp.getgrnam, ["users", "guest", "other", "unknown",
"usr"])[0]
if wheel is None:
wheel = findnss(grp.getgrnam, "wheel", "root", "staff", "adm")[0]
wheel = findnss(grp.getgrnam, ["wheel", "root", "staff", "adm"])[0]
if backup is None:
backup = findnss(grp.getgrnam, "backup", "wheel", "root", "staff")[0]
backup = findnss(grp.getgrnam, ["backup", "wheel", "root", "staff"])[0]
if aci is None:
aci = "# no aci for local ldb"
if serverrole is None:
@ -781,10 +794,10 @@ def provision(lp, setup_dir, message, paths, session_info,
domain = netbiosname
if rootdn is None:
rootdn = domaindn
rootdn = domaindn
configdn = "CN=Configuration," + rootdn
schemadn = "CN=Schema," + configdn
configdn = "CN=Configuration," + rootdn
schemadn = "CN=Schema," + configdn
message("set DOMAIN SID: %s" % str(domainsid))
message("Provisioning for %s in realm %s" % (domain, realm))