From bed50f04cb2234a0a2d6f3036405237b465b46ae Mon Sep 17 00:00:00 2001 From: Björn Baumbach Date: Wed, 20 Jul 2011 12:56:22 +0200 Subject: s4-param: use "state directory" and "cache directory" options instead of "state dir" and "cache dir" in order be compatible with the source3 code. Signed-off-by: Stefan Metzmacher --- source4/param/loadparm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/param') diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index b18f8fc429..3b0eefe603 100644 --- 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", ""); -- cgit