param: turn 'printcap name' into a generated function

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

diff --git a/docs-xml/smbdotconf/printing/printcapname.xml b/docs-xml/smbdotconf/printing/printcapname.xml
index a6c4c75de32cadfdb55844171e401dbf47f0b9a9..64acc265aefd5f4276a39f35e42580cee0d754e2 100644 (file)
--- a/docs-xml/smbdotconf/printing/printcapname.xml
+++ b/docs-xml/smbdotconf/printing/printcapname.xml
@@ -1,7 +1,7 @@
 <samba:parameter name="printcap name"
                  context="G"
                  type="string"
-                 generated_function="0"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <synonym>printcap</synonym>
 <description>

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

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