diff options
| author | Björn Baumbach <bb@sernet.de> | 2011-07-20 12:56:22 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-21 08:51:54 +0200 |
| commit | bed50f04cb2234a0a2d6f3036405237b465b46ae (patch) | |
| tree | d73a76886db98b6eb6d0c1413281a37c54fa857b /source4/param | |
| parent | 7f9d45bf10d36b1b443305e0f2e79cb448b98cbd (diff) | |
| download | samba-bed50f04cb2234a0a2d6f3036405237b465b46ae.tar.gz samba-bed50f04cb2234a0a2d6f3036405237b465b46ae.tar.bz2 samba-bed50f04cb2234a0a2d6f3036405237b465b46ae.zip | |
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 <metze@samba.org>
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 8 |
1 files changed, 4 insertions, 4 deletions
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", ""); |