[commits] r3316 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/check_pf.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Aug 30 00:04:14 2007
New Revision: 3316

Log:
Import glibc-mainline for 2007-08-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/check_pf.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Aug 30 00:04:14 2007
@@ -1,3 +1,11 @@
+2007-08-29  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/check_pf.c (IFA_F_OPTIMISTIC): Define to
+	zero if not defined.
+	(make_request): Recognize optimistic addresses and treat them like
+	deprecated addresses.
+	Reported by Neil Horman <nhorman@xxxxxxxxxx>.
+
 2007-08-28  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* nscd/connections.c (send_ro_fd): Also transfer file size.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/check_pf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/check_pf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/check_pf.c Thu Aug 30 00:04:14 2007
@@ -40,6 +40,9 @@
 #endif
 #ifndef IFA_F_HOMEADDRESS
 # define IFA_F_HOMEADDRESS 0
+#endif
+#ifndef IFA_F_OPTIMISTIC
+# define IFA_F_OPTIMISTIC 0
 #endif
 
 
@@ -203,10 +206,13 @@
 
 		  if (ifam->ifa_flags & (IFA_F_DEPRECATED
 					 | IFA_F_TEMPORARY
-					 | IFA_F_HOMEADDRESS))
+					 | IFA_F_HOMEADDRESS
+					 | IFA_F_OPTIMISTIC))
 		    {
 		      struct in6ailist *newp = alloca (sizeof (*newp));
-		      newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED)
+		      newp->info.flags = (((ifam->ifa_flags
+					    & (IFA_F_DEPRECATED
+					       | IFA_F_OPTIMISTIC))
 					   ? in6ai_deprecated : 0)
 					  | ((ifam->ifa_flags
 					      & IFA_F_TEMPORARY)