Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > af3bc2e7a0f4ec3df914667f2210a13b > files > 10

cups-1.4.6-3.1.mga1.src.rpm

diff -Naur -x '*.rej' -x '*.orig' -x '*~' cups-1.4.4/scheduler/client.c cups-1.4.4-no-hostname-broadcast//scheduler/client.c
--- cups-1.4.4/scheduler/client.c	2010-04-23 20:56:34.000000000 +0200
+++ cups-1.4.4-no-hostname-broadcast//scheduler/client.c	2010-09-09 19:50:03.000000000 +0200
@@ -422,7 +422,7 @@
     {
       if (httpAddrLocalhost(&temp))
         strlcpy(con->servername, "localhost", sizeof(con->servername));
-      else if (HostNameLookups || RemotePort)
+      else if (HostNameLookups)
         httpAddrLookup(&temp, con->servername, sizeof(con->servername));
       else
         httpAddrString(&temp, con->servername, sizeof(con->servername));
@@ -435,7 +435,7 @@
     {
       if (httpAddrLocalhost(&temp))
         strlcpy(con->servername, "localhost", sizeof(con->servername));
-      else if (HostNameLookups || RemotePort)
+      else if (HostNameLookups)
         httpAddrLookup(&temp, con->servername, sizeof(con->servername));
       else
         httpAddrString(&temp, con->servername, sizeof(con->servername));
diff -Naur -x '*.rej' -x '*.orig' -x '*~' cups-1.4.4/scheduler/conf.c cups-1.4.4-no-hostname-broadcast//scheduler/conf.c
--- cups-1.4.4/scheduler/conf.c	2010-04-23 20:56:34.000000000 +0200
+++ cups-1.4.4-no-hostname-broadcast//scheduler/conf.c	2010-09-09 19:50:03.000000000 +0200
@@ -744,7 +744,7 @@
     cupsdAddAlias(ServerAlias, temp);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", temp);
 
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
     {
       struct hostent	*host;		/* Host entry to get FQDN */
 
diff -Naur -x '*.rej' -x '*.orig' -x '*~' cups-1.4.4/scheduler/network.c cups-1.4.4-no-hostname-broadcast//scheduler/network.c
--- cups-1.4.4/scheduler/network.c	2010-04-10 00:42:09.000000000 +0200
+++ cups-1.4.4-no-hostname-broadcast//scheduler/network.c	2010-09-09 19:50:53.000000000 +0200
@@ -157,7 +157,7 @@
 #ifdef __APPLE__
     if (HostNameLookups)
 #else
-    if (HostNameLookups || RemotePort)
+    if (HostNameLookups)
 #endif /* __APPLE__ */
       httpAddrLookup((http_addr_t *)(addr->ifa_addr), hostname,
                      sizeof(hostname));