]>
Commit | Line | Data |
---|---|---|
40d90f9e AM |
1 | diff -ur samba-3.0.26a/source3/param/loadparm.c samba-3.0.26a-lprng/source3/param/loadparm.c |
2 | --- samba-3.0.26a/source3/param/loadparm.c 2007-09-11 16:21:57.000000000 +0200 | |
3 | +++ samba-3.0.26a-lprng/source3/param/loadparm.c 2007-10-09 17:22:57.000000000 +0200 | |
abc624bf JR |
4 | @@ -5548,6 +5548,11 @@ |
5 | return PRINTCAP_NAME; | |
6 | } | |
7 | ||
8 | +int lp_defaultprinting(void) | |
9 | +{ | |
03fb92f7 | 10 | + return sDefault.printing; |
abc624bf JR |
11 | +} |
12 | + | |
f75e5120 JP |
13 | static uint32_t spoolss_state; |
14 | ||
15 | bool lp_disable_spoolss( void ) | |
423b7f34 AM |
16 | --- samba-3.6.0/source3/printing/print_standard.c~ 2011-08-09 13:17:47.000000000 +0200 |
17 | +++ samba-3.6.0/source3/printing/print_standard.c 2011-10-17 21:15:15.693523176 +0200 | |
cc54fa40 | 18 | @@ -64,6 +64,7 @@ bool std_pcap_cache_reload(const char *p |
abc624bf | 19 | char *pcap_line; |
cc54fa40 | 20 | struct pcap_cache *pcache = NULL; |
008e93ad | 21 | bool print_warning = false; |
abc624bf JR |
22 | + enum printing_types printing = lp_defaultprinting(); |
23 | ||
f75e5120 | 24 | if ((pcap_file = fopen(pcap_name, "r")) == NULL) { |
423b7f34 AM |
25 | DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name)); |
26 | @@ -77,6 +79,10 @@ | |
423b7f34 | 27 | continue; |
f75e5120 | 28 | } |
abc624bf JR |
29 | |
30 | + /* skip .name in case of LPRng */ | |
e607a546 | 31 | + if (printing == PRINT_LPRNG && *name == '.') |
abc624bf JR |
32 | + continue; |
33 | + | |
423b7f34 AM |
34 | /* now we have a real printer line - cut at the first : */ |
35 | if ((p = strchr_m(pcap_line, ':')) != NULL) | |
36 | *p = 0; | |
37 |