param: Rename variable used for lp_passwd_program szPasswdProgram

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

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 1f9fe808381cfb567c49e9f9278a9d6b8716a414..4b8b853738877e741d4539a5008ba46e482e1182 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -398,7 +398,7 @@ FN_GLOBAL_STRING(nis_home_map_name, nis_home_map_name)
 FN_GLOBAL_STRING(os2_driver_map, os2_driver_map)
 FN_GLOBAL_STRING(panic_action, panic_action)
 FN_GLOBAL_STRING(passwd_chat, passwd_chat)
-FN_GLOBAL_STRING(passwd_program, szPasswdProgram)
+FN_GLOBAL_STRING(passwd_program, passwd_program)
 FN_GLOBAL_STRING(perfcount_module, szSMBPerfcountModule)
 FN_GLOBAL_STRING(remote_announce, szRemoteAnnounce)
 FN_GLOBAL_STRING(remote_browse_sync, szRemoteBrowseSync)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 1fd379ea2580ee1096a1d7721a4bf6bacefb818c..470fd90a743bf496b7e4613d3ca60ab676abef75 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -611,7 +611,7 @@ static struct parm_struct parm_table[] = {
                .label          = "passwd program",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPasswdProgram),
+               .offset         = GLOBAL_VAR(passwd_program),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d21b51cb731c3ca64b5c74816394083ab1336d09..0402a131f499978e4b3ab76922c315f936c2daec 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -772,7 +772,7 @@ static void init_globals(bool reinit_globals)
 
        string_set(&Globals.workgroup, DEFAULT_WORKGROUP);
 
-       string_set(&Globals.szPasswdProgram, "");
+       string_set(&Globals.passwd_program, "");
        string_set(&Globals.lockdir, get_dyn_LOCKDIR());
        string_set(&Globals.szStateDir, get_dyn_STATEDIR());
        string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());