~ubuntu-branches/ubuntu/feisty/samba/feisty-security

« back to all changes in this revision

Viewing changes to debian/patches/.svn/text-base/cups.patch.svn-base

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2006-03-24 02:59:17 UTC
  • mfrom: (0.5.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060324025917-ztv23ezkut7lt4t1
Tags: 3.0.21c-1ubuntu1
* Merge with Debian for new upstream bugfixes, UVF exception by mdz.
* Remove dapper->dapper upgrade hack, which should be a non-issue now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: samba-3.0.21b/source/include/includes.h
2
 
===================================================================
3
 
--- samba-3.0.21b.orig/source/include/includes.h        2006-02-06 00:01:10.000000000 -0800
4
 
+++ samba-3.0.21b/source/include/includes.h     2006-02-06 00:01:15.000000000 -0800
5
 
@@ -1066,10 +1066,7 @@
6
 
 #endif
7
 
 
8
 
 #ifndef DEFAULT_PRINTING
9
 
-#ifdef HAVE_CUPS
10
 
-#define DEFAULT_PRINTING PRINT_CUPS
11
 
-#define PRINTCAP_NAME "cups"
12
 
-#elif defined(SYSV)
13
 
+#if defined(SYSV)
14
 
 #define DEFAULT_PRINTING PRINT_SYSV
15
 
 #define PRINTCAP_NAME "lpstat"
16
 
 #else