[Pkg-cups-devel] r728 - cupsys/trunk/debian/patches

[Till Kamppeter]

Author: till-guest
Date: Thu Mar 20 16:47:06 2008
New Revision: 728

Log:
Corrected debian/patches/ppd-poll-with-client-conf.dpatch


Modified:
   cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch

Modified: cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch	(original)
+++ cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch	Thu Mar 20 16:47:06 2008
@@ -7,13 +7,22 @@
 @DPATCH@
 diff -urNad cupsys-1.3.6~/cups/util.c cupsys-1.3.6/cups/util.c
 --- cupsys-1.3.6~/cups/util.c	2008-01-17 00:42:35.000000000 +0100
-+++ cupsys-1.3.6/cups/util.c	2008-03-20 13:07:07.000000000 +0100
-@@ -810,7 +810,7 @@
- 
-   if (!strcasecmp(http_hostname, hostname) && port == http_port)
++++ cupsys-1.3.6/cups/util.c	2008-03-20 17:44:46.000000000 +0100
+@@ -812,11 +812,13 @@
      http2 = http;
--  else if ((http2 = httpConnectEncrypt(hostname, port,
-+  else if ((http2 = httpConnectEncrypt(http_hostname, http_port,
+   else if ((http2 = httpConnectEncrypt(hostname, port,
                                         cupsEncryption())) == NULL)
-   {
-     DEBUG_puts("Unable to connect to server!");
+-  {
+-    DEBUG_puts("Unable to connect to server!");
++    if ((http2 = httpConnectEncrypt(http_hostname, http_port,
++				    cupsEncryption())) == NULL)
++    {
++      DEBUG_puts("Unable to connect to server!");
+ 
+-    return (NULL);
+-  }
++      return (NULL);
++    }
+ 
+  /*
+   * Get a temp file...