summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-17 21:49:19 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-17 23:55:39 +1100
commit333975d84f1f5016ad8d61c8107ef76e43af0c7e (patch)
treed9bcb501a2bcb9db1a5e833132da7a1ebea4d6cc /source4
parent9432eabb2f6ba282943e1b7ea4e90c0ed38cefe2 (diff)
downloadsamba-333975d84f1f5016ad8d61c8107ef76e43af0c7e.tar.gz
samba-333975d84f1f5016ad8d61c8107ef76e43af0c7e.tar.bz2
samba-333975d84f1f5016ad8d61c8107ef76e43af0c7e.zip
s4-provision: setup posix:eadb using lp.set()
this allows it to override a setting made during the automatic testing of xattr support
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py7
-rw-r--r--source4/setup/provision.smb.conf.dc1
-rw-r--r--source4/setup/provision.smb.conf.member1
-rw-r--r--source4/setup/provision.smb.conf.standalone1
4 files changed, 2 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 659e8aba67..cb1e8bd3ee 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -595,9 +595,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
privdir = os.path.join(targetdir, "private")
else:
privdir = lp.get("private dir")
- posixeadb_line = "posix:eadb = " + os.path.abspath(os.path.join(privdir, "eadb.tdb"))
- else:
- posixeadb_line = ""
+ lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb")))
if targetdir is not None:
privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private"))
@@ -634,8 +632,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
"SETUPDIRECTORY_LINE": setupdir_line,
"SIDGENERATOR_LINE": sid_generator_line,
"PRIVATEDIR_LINE": privatedir_line,
- "LOCKDIR_LINE": lockdir_line,
- "POSIXEADB_LINE": posixeadb_line
+ "LOCKDIR_LINE": lockdir_line
})
# reload the smb.conf
diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index e720900eb4..d3a7a81834 100644
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -7,7 +7,6 @@
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}
- ${POSIXEADB_LINE}
[netlogon]
path = ${NETLOGONPATH}
diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 9fe8995723..49372f115d 100644
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -7,4 +7,3 @@
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}
- ${POSIXEADB_LINE}
diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 9fe8995723..49372f115d 100644
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -7,4 +7,3 @@
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}
- ${POSIXEADB_LINE}