s4-provision: setup posix:eadb using lp.set()
authorAndrew Tridgell <tridge@samba.org>
Wed, 17 Nov 2010 10:49:19 +0000 (21:49 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 17 Nov 2010 12:55:39 +0000 (23:55 +1100)
this allows it to override a setting made during the automatic testing
of xattr support

source4/scripting/python/samba/provision.py
source4/setup/provision.smb.conf.dc
source4/setup/provision.smb.conf.member
source4/setup/provision.smb.conf.standalone

index 659e8aba67ca6a707ad630e9714a75c3d5d48d36..cb1e8bd3ee23ea97ac17d4b6b25ae202223a4cf3 100644 (file)
@@ -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
index e720900eb454800064cf1da308018dc2f1ec66d1..d3a7a818342fd70c19318535a7c5d9297f86ba63 100644 (file)
@@ -7,7 +7,6 @@
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}
-       ${POSIXEADB_LINE}
 
 [netlogon]
        path = ${NETLOGONPATH}
index 9fe8995723b65a94617dd748823158f4ac05efae..49372f115dd72c5ffb79d5795be1c6603d176bfd 100644 (file)
@@ -7,4 +7,3 @@
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}
-       ${POSIXEADB_LINE}
index 9fe8995723b65a94617dd748823158f4ac05efae..49372f115dd72c5ffb79d5795be1c6603d176bfd 100644 (file)
@@ -7,4 +7,3 @@
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}
-       ${POSIXEADB_LINE}