Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12005 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index e37138e4f01a1f98dcf9b767a46abd57dddd2cdf..26076645f6c55fa1c7a5ef6e48e0013c0faa32f0 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.4 - 2014-07-03
+CHANGES.txt - 1.7.4 - 2014-07-08
 --------------------------------
 
 CHANGES IN CUPS V1.7.4
@@ -25,6 +25,7 @@ CHANGES IN CUPS V1.7.4
        - Fixed a bug in the CUPS_SC_GET_DEVICE_ID handling by the network
          backends (STR #4447)
        - Added USB quirk rule for Lexmark E230 (STR #4448)
+       - The LPD backend did not work with some versions of glibc (STR #4452)
 
 
 CHANGES IN CUPS V1.7.3

diff --git a/backend/lpd.c b/backend/lpd.c
index faf71aff5c07d58134b100c6ec556188b82bed8e..92f243015794870432ac0a9ea103139d6df7b257 100644 (file)
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1276,7 +1276,7 @@ rresvport_af(int *port,                   /* IO - Port number to bind to */
     * Try binding the port to the socket; return if all is OK...
     */
 
-    if (!bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+    if (!bind(fd, (struct sockaddr *)&addr, httpAddrSize(&addr)))
       return (fd);
 
    /*