param: rename lp function and variable from 'wtmpdir' to 'wtmp_directory'

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 79a035b668d17ea5b7c8bd9253e0e19f21bc39d1..d53fcf2f28b124c1e4c9b06a7f1433edd0bf7d6e 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -269,7 +269,7 @@ FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, winbindd_privileged
 FN_GLOBAL_CONST_STRING(winbindd_socket_directory, winbindd_socket_directory)
 FN_GLOBAL_CONST_STRING(winbind_separator, winbind_separator)
 FN_GLOBAL_CONST_STRING(workgroup, workgroup)
-FN_GLOBAL_CONST_STRING(wtmpdir, wtmpdir)
+FN_GLOBAL_CONST_STRING(wtmp_directory, wtmp_directory)
 FN_GLOBAL_INTEGER(afs_token_lifetime, afs_token_lifetime)
 FN_GLOBAL_INTEGER(algorithmic_rid_base, algorithmic_rid_base)
 FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 6edcc0cde17c03cf90d84f862f95a0eca53d346c..8285f20d4593b147fd0a3f6aff12e5ed7f51a340 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3363,7 +3363,7 @@ static struct parm_struct parm_table[] = {
                .label          = "wtmp directory",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(wtmpdir),
+               .offset         = GLOBAL_VAR(wtmp_directory),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/smbd/utmp.c b/source3/smbd/utmp.c
index 15abc521cb7baa95794d901052cf5f2a3fbd16ab..cdbcc28cce62f560a6ecd1d875e6b4b60bf585ec 100644 (file)
--- a/source3/smbd/utmp.c
+++ b/source3/smbd/utmp.c
@@ -218,7 +218,7 @@ static char *uw_pathname(TALLOC_CTX *ctx,
 
        /* For w-files, first look for explicit "wtmp dir" */
        if (uw_name[0] == 'w') {
-               dirname = talloc_strdup(ctx, lp_wtmpdir());
+               dirname = talloc_strdup(ctx, lp_wtmp_directory());
                if (!dirname) {
                        return NULL;
                }