summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2015-07-21 14:34:11 +0200
committerJeremy Allison <jra@samba.org>2015-07-31 01:55:30 +0200
commita6e387d689b06e45282d1ad04d4a6af9d73ca6a4 (patch)
tree8d0ba6c1be3b459bcb2945416d4c8f99bcf39203 /source3/param
parent373245680592f746e19e1218de9ded96f50b46c1 (diff)
downloadsamba-a6e387d689b06e45282d1ad04d4a6af9d73ca6a4.tar.gz
param: turn 'printcap name' into a generated function
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c8
1 files changed, 5 insertions, 3 deletions
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";