summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-09-10 06:36:02 +0200
committerStefan Metzmacher <metze@samba.org>2010-09-10 17:21:31 +0200
commit0ad2890c4e5a0249d45440f66b0ceae33c832328 (patch)
tree17943939103a75a3d158296e849fef51e9e79ef9 /source4/setup
parentbf7ca3f5e7e6f126fd8baec5548dfd45bc5e168f (diff)
downloadsamba-0ad2890c4e5a0249d45440f66b0ceae33c832328.tar.gz
samba-0ad2890c4e5a0249d45440f66b0ceae33c832328.tar.bz2
samba-0ad2890c4e5a0249d45440f66b0ceae33c832328.zip
s4:provision: remember the setup directory if it wasn't the default
This fixes make test without a make install. metze
Diffstat (limited to 'source4/setup')
-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
3 files changed, 3 insertions, 0 deletions
diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index 0449f75ffe..e720900eb4 100644
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -3,6 +3,7 @@
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}
+ ${SETUPDIRECTORY_LINE}
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}
diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 4d32ef478c..9fe8995723 100644
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -3,6 +3,7 @@
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}
+ ${SETUPDIRECTORY_LINE}
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}
diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 4d32ef478c..9fe8995723 100644
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -3,6 +3,7 @@
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}
+ ${SETUPDIRECTORY_LINE}
${SIDGENERATOR_LINE}
${PRIVATEDIR_LINE}
${LOCKDIR_LINE}