s4-param: use "state directory" and "cache directory" options

[kai/samba-autobuild/.git] / source4 / param / loadparm.c

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b18f8fc4298beb2a2538bf559f9568cb8cb4df80..3b0eefe603bb629c0780122a0980f3a786554e6b 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1083,7 +1083,7 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL
        },
        {
-               .label          = "state dir",
+               .label          = "state directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(szStateDir),
@@ -1091,7 +1091,7 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL
        },
        {
-               .label          = "cache dir",
+               .label          = "cache directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
                .offset         = GLOBAL_VAR(szCacheDir),
@@ -3309,8 +3309,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "pid directory", dyn_PIDDIR);
        lpcfg_do_global_parameter(lp_ctx, "lock dir", dyn_LOCKDIR);
-       lpcfg_do_global_parameter(lp_ctx, "state dir", dyn_STATEDIR);
-       lpcfg_do_global_parameter(lp_ctx, "cache dir", dyn_CACHEDIR);
+       lpcfg_do_global_parameter(lp_ctx, "state directory", dyn_STATEDIR);
+       lpcfg_do_global_parameter(lp_ctx, "cache directory", dyn_CACHEDIR);
        lpcfg_do_global_parameter(lp_ctx, "ncalrpc dir", dyn_NCALRPCDIR);
 
        lpcfg_do_global_parameter(lp_ctx, "socket address", "");