mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
param: turn 'printcap name' into a generated function
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
committed by
Jeremy Allison
parent
3732456805
commit
a6e387d689
@ -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>
|
||||
|
@ -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; \
|
||||
|
@ -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";
|
||||
|
Reference in New Issue
Block a user