summaryrefslogtreecommitdiffstats
path: root/source3/script
diff options
context:
space:
mode:
authorSteven Danneman <steven.danneman@isilon.com>2009-01-08 11:18:13 -0800
committerMichael Adam <obnox@samba.org>2009-01-12 12:16:03 +0100
commit19a05bf2f485023b11b41dfae3f6459847d55ef7 (patch)
tree74b17e9f203dd81926a09876dc78e7cae3e799f6 /source3/script
parentffb53c35748154081c1587b5f167721e32ff10f2 (diff)
downloadsamba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.gz
samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.tar.xz
samba-19a05bf2f485023b11b41dfae3f6459847d55ef7.zip
Make STATEDIR and CACHEDIR configurable through ./configure and loadparm.c
If they are not explicitely set in either place both will default to LOCKDIR. Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/script')
-rw-r--r--source3/script/mkbuildoptions.awk2
-rwxr-xr-xsource3/script/tests/selftest.sh2
2 files changed, 4 insertions, 0 deletions
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index a1e5d850619..1955a80b46c 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -90,6 +90,8 @@ BEGIN {
print " output(screen,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());";
print " output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());";
+ print " output(screen,\" STATEDIR: %s\\n\",get_dyn_STATEDIR());";
+ print " output(screen,\" CACHEDIR: %s\\n\",get_dyn_CACHEDIR());";
print " output(screen,\" PIDDIR: %s\\n\", get_dyn_PIDDIR());";
print " output(screen,\" SMB_PASSWD_FILE: %s\\n\",get_dyn_SMB_PASSWD_FILE());";
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 4786a78d31b..94fd791b51c 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -140,6 +140,8 @@ cat >$COMMONCONFFILE<<EOF
private dir = $PRIVATEDIR
pid directory = $PIDDIR
lock directory = $LOCKDIR
+ state directory = $LOCKDIR
+ cache directory = $LOCKDIR
log file = $LOGDIR/log.%m
log level = 0