rediffed patches

[packages/samba.git] / samba-lprng-no-dot-printers.patch

diff --git a/samba-lprng-no-dot-printers.patch b/samba-lprng-no-dot-printers.patch
index 4ced8153e1fda0268824e1e1cc6ab5e5b06b5c42..35f5210be26cf14eed8417745e3070327dc7fecf 100644 (file)
--- a/samba-lprng-no-dot-printers.patch
+++ b/samba-lprng-no-dot-printers.patch
@@ -10,9 +10,9 @@ diff -ur samba-3.0.26a/source3/param/loadparm.c samba-3.0.26a-lprng/source3/para
 +      return sDefault.printing;
 +}
 +
- /*******************************************************************
-  Ensure we don't use sendfile if server smb signing is active.
- ********************************************************************/
+ static uint32_t spoolss_state;
+ 
+ bool lp_disable_spoolss( void )
 --- samba-3.6.0/source3/printing/print_standard.c~     2011-08-09 13:17:47.000000000 +0200
 +++ samba-3.6.0/source3/printing/print_standard.c      2011-10-17 21:15:15.693523176 +0200
 @@ -64,6 +64,7 @@ bool std_pcap_cache_reload(const char *p
@@ -21,11 +21,11 @@ diff -ur samba-3.0.26a/source3/param/loadparm.c samba-3.0.26a-lprng/source3/para
        bool print_warning = false;
 +      enum printing_types printing = lp_defaultprinting();
  
-       if ((pcap_file = x_fopen(pcap_name, O_RDONLY, 0)) == NULL) {
+       if ((pcap_file = fopen(pcap_name, "r")) == NULL) {
                DEBUG(0, ("Unable to open printcap file %s for read!\n", pcap_name));
 @@ -77,6 +79,10 @@
-               if (*pcap_line == '#' || *pcap_line == 0)
                        continue;
+               }
  
 +              /* skip .name in case of LPRng */
 +              if (printing == PRINT_LPRNG && *name == '.')