git.samba.org
/
kai
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4e3144
)
provision: Remove unnecessary whitespace.
author
Jelmer Vernooij
<jelmer@samba.org>
Sun, 28 Mar 2010 20:42:31 +0000
(22:42 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Sun, 28 Mar 2010 20:42:31 +0000
(22:42 +0200)
source4/scripting/python/samba/provision.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/provision.py
b/source4/scripting/python/samba/provision.py
index 1d5e61c4855c4c4abecf3563b83574354b3cf48f..9e7f1372c2756848af62d0e85c38ce8abbe422c6 100644
(file)
--- a/
source4/scripting/python/samba/provision.py
+++ b/
source4/scripting/python/samba/provision.py
@@
-236,7
+236,7
@@
def setup_add_ldif(ldb, ldif_path, subst_vars=None,controls=["relax:0"]):
"""
assert isinstance(ldif_path, str)
data = read_and_sub_file(ldif_path, subst_vars)
"""
assert isinstance(ldif_path, str)
data = read_and_sub_file(ldif_path, subst_vars)
- ldb.add_ldif(data,controls)
+ ldb.add_ldif(data,
controls)
def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
@@
-247,7
+247,6
@@
def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
:param subst_vars: Optional dictionary with substitution variables.
"""
data = read_and_sub_file(ldif_path, subst_vars)
:param subst_vars: Optional dictionary with substitution variables.
"""
data = read_and_sub_file(ldif_path, subst_vars)
-
ldb.modify_ldif(data)
ldb.modify_ldif(data)
@@
-301,13
+300,9
@@
def provision_paths_from_lp(lp, dnsdomain):
paths.hku = "hku.ldb"
paths.hkpd = "hkpd.ldb"
paths.hkpt = "hkpt.ldb"
paths.hku = "hku.ldb"
paths.hkpd = "hkpd.ldb"
paths.hkpt = "hkpt.ldb"
-
paths.sysvol = lp.get("path", "sysvol")
paths.sysvol = lp.get("path", "sysvol")
-
paths.netlogon = lp.get("path", "netlogon")
paths.netlogon = lp.get("path", "netlogon")
-
paths.smbconf = lp.configfile
paths.smbconf = lp.configfile
-
return paths
return paths