From 19a01068b618358577b5a6606e23628870f29038 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Dec 2013 16:04:28 +1300 Subject: [PATCH] param: Rename variable used for lp_cups_server szCupsServer Signed-off-by: Andrew Bartlett Signed-off-by: Garming Sam Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 360a3e14371..eb5ef9f7809 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -378,7 +378,7 @@ FN_GLOBAL_STRING(addusertogroup_script, addusertogroup_script) FN_GLOBAL_STRING(auto_services, auto_services) FN_GLOBAL_STRING(change_share_cmd, change_share_cmd) FN_GLOBAL_STRING(check_password_script, check_password_script) -FN_GLOBAL_STRING(cups_server, szCupsServer) +FN_GLOBAL_STRING(cups_server, cups_server) FN_GLOBAL_STRING(defaultservice, szDefaultService) FN_GLOBAL_STRING(deleteprinter_cmd, szDeletePrinterCommand) FN_GLOBAL_STRING(delete_share_cmd, szDeleteShareCommand) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 002e1ed7906..b9c82bc8462 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2121,7 +2121,7 @@ static struct parm_struct parm_table[] = { .label = "cups server", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szCupsServer), + .offset = GLOBAL_VAR(cups_server), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b7fd6fe7274..4393cfbbf44 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -963,7 +963,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.winbind_separator, "\\"); string_set(&Globals.winbindd_socket_directory, dyn_WINBINDD_SOCKET_DIR); - string_set(&Globals.szCupsServer, ""); + string_set(&Globals.cups_server, ""); string_set(&Globals.szIPrintServer, ""); #ifdef CLUSTER_SUPPORT -- 2.11.4.GIT