selftest: use "state directory" and "cache directory" options

instead of "state dir" and "cache dir"

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Jul 21 10:06:32 CEST 2011 on sn-devel-104

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 218f83ba14df9dea401bfbd57c92d4ed195852d6..78627c8eb660f882ddc819e4ba5eb3400d1d397e 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -639,8 +639,8 @@ sub write_clientconf($$$)
        print CF "
        private dir = $clientdir/private
        lock dir = $clientdir/lockdir
-       state dir = $clientdir/statedir
-       cache dir = $clientdir/cachedir
+       state directory = $clientdir/statedir
+       cache directory = $clientdir/cachedir
        ncalrpc dir = $clientdir/ncalrpcdir
        name resolve order = file bcast
        panic action = $RealBin/gdb_backtrace \%d

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 47f1bad3360b32c3c627550912e4218558525b91..a1d894d64f32df63e4983fc25ee8bfd037d8f4b9 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -597,8 +597,8 @@ sub provision_raw_step1($$)
        pid directory = $ctx->{piddir}
        ncalrpc dir = $ctx->{ncalrpcdir}
        lock dir = $ctx->{lockdir}
-       state dir = $ctx->{statedir}
-       cache dir = $ctx->{cachedir}
+       state directory = $ctx->{statedir}
+       cache directory = $ctx->{cachedir}
        winbindd socket directory = $ctx->{winbindd_socket_dir}
        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}