Merge changes from CUPS 1.5svn-r9374.

[thirdparty/cups.git] / cups / getifaddrs.c

diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 0daf59b852a69917a7bdb8a85335a25b587985a9..6c9cc554769a6334326384c238cae99732f68a30 100644 (file)
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,26 +1,16 @@
 /*
- * "$Id: getifaddrs.c 5466 2006-04-26 19:52:27Z mike $"
+ * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $"
  *
- *   Network interface functions for the Common UNIX Printing System
- *   (CUPS) scheduler.
+ *   Network interface functions for CUPS.
  *
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  * Contents:
  *
@@ -182,8 +172,9 @@ _cups_getifaddrs(struct ifaddrs **addrs)/* O - List of interfaces */
        * Got it, make a copy...
        */
 
-       if ((temp->ifa_dstaddr = calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
-         memcpy(temp->ifa_dstaddr, &(request.ifr_broadaddr),
+       if ((temp->ifa_broadaddr =
+                calloc(1, sizeof(request.ifr_broadaddr))) != NULL)
+         memcpy(temp->ifa_broadaddr, &(request.ifr_broadaddr),
                 sizeof(request.ifr_broadaddr));
       }
     }
@@ -271,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id: getifaddrs.c 5466 2006-04-26 19:52:27Z mike $".
+ * End of "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $".
  */