From: Michael Adam <obnox@samba.org>
Date: Tue, 21 Jul 2015 12:34:11 +0000 (+0200)
Subject: param: turn 'printcap name' into a generated function
X-Git-Tag: talloc-2.1.4~524
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6e387d689b06e45282d1ad04d4a6af9d73ca6a4;p=thirdparty%2Fsamba.git

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 a6c4c75de32..64acc265aef 100644
--- 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 46c683eef44..bd170079b75 100644
--- 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 b1a404acfe3..98eaec590f5 100644
--- 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";