param: Rename variable used for lp_printjob_username szPrintjobUsername

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 03476b99d7e03c3023ab71ddf22bda56851a5ca1..b589fed18e618373a97bc028c1876f534124907d 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -64,7 +64,7 @@ FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
 FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
 FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
 static FN_LOCAL_STRING(_printername, szPrintername)
-FN_LOCAL_CONST_STRING(printjob_username, szPrintjobUsername)
+FN_LOCAL_CONST_STRING(printjob_username, printjob_username)
 FN_LOCAL_STRING(magicscript, szMagicScript)
 FN_LOCAL_STRING(magicoutput, szMagicOutput)
 FN_LOCAL_STRING(comment, comment)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 94e7fd4fb3f08422e49ec996a01d90aa7c558eb0..7c4097dc00c8b5a5fcbb5df8781f107c25de734a 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2339,7 +2339,7 @@ static struct parm_struct parm_table[] = {
                .label          = "printjob username",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(szPrintjobUsername),
+               .offset         = LOCAL_VAR(printjob_username),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_PRINT,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7240cf81b8c1576aaead3242758c9ff96ddc63e4..0e4e1e9971014447dbd0a3884bab78b658e95c6f 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -166,7 +166,7 @@ static struct loadparm_service sDefault =
        .queuepausecommand = NULL,
        .queueresumecommand = NULL,
        .szPrintername = NULL,
-       .szPrintjobUsername = NULL,
+       .printjob_username = NULL,
        .dontdescend = NULL,
        .hostsallow = NULL,
        .hostsdeny = NULL,
@@ -740,7 +740,7 @@ static void init_globals(bool reinit_globals)
 
 
        string_set(&sDefault.fstype, FSTYPE_STRING);
-       string_set(&sDefault.szPrintjobUsername, "%U");
+       string_set(&sDefault.printjob_username, "%U");
 
        init_printer_values(&sDefault);