param: rename szPrintcapName -> printcap_name

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 2c40563fc8cb75b2fe0ac9f914bad7ce489d8e3a..46c683eef443694c4cc2599a69b07640896bc015 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -249,7 +249,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
 #define LOADPARM_EXTRA_GLOBALS \
        struct parmlist_entry *param_opt;                               \
        char *realm_original;                                           \
-       char *szPrintcapname;                                           \
+       char *printcap_name;                                            \
        int CupsEncrypt;                                                \
        char *szIdmapUID;                                               \
        char *szIdmapGID;                                               \

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 02f6e56d1b0508c1a117731818d8756e64f2d9a0..f2a737b4539fa6f77bcd082a74e296a2924a5871 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1917,7 +1917,7 @@ struct parm_struct parm_table[] = {
                .label          = "printcap name",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPrintcapname),
+               .offset         = GLOBAL_VAR(printcap_name),
                .special        = NULL,
                .enum_list      = NULL,
        },
@@ -1925,7 +1925,7 @@ struct parm_struct parm_table[] = {
                .label          = "printcap",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szPrintcapname),
+               .offset         = GLOBAL_VAR(printcap_name),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_SYNONYM,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d19e144b6263d7e17db4af43e289a1fecdd8c74f..b1a404acfe3441a47bbf1b77412ba30988215b13 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4155,9 +4155,9 @@ int lp_maxprintjobs(int snum)
 
 const char *lp_printcapname(void)
 {
-       if ((Globals.szPrintcapname != NULL) &&
-           (Globals.szPrintcapname[0] != '\0'))
-               return Globals.szPrintcapname;
+       if ((Globals.printcap_name != NULL) &&
+           (Globals.printcap_name[0] != '\0'))
+               return Globals.printcap_name;
 
        if (sDefault.printing == PRINT_CUPS) {
                return "cups";