summary refs log tree commit diff
diff options
context:
space:
mode:
authorArnaud Ebalard <arno@natisbad.org>2009-06-15 20:33:39 -0700
committerPetr Baudis <pasky@suse.cz>2009-06-16 12:22:37 +0200
commit3ff6565150bef32e4cfc565b1463df84dd8c6d7a (patch)
tree532b04863f3f91a7b97462ce56911f367c26eed9
parent26330c1c489a2cb2ea775390c9a7a6302954f64c (diff)
downloadglibc-3ff6565150bef32e4cfc565b1463df84dd8c6d7a.tar.gz
glibc-3ff6565150bef32e4cfc565b1463df84dd8c6d7a.tar.xz
glibc-3ff6565150bef32e4cfc565b1463df84dd8c6d7a.zip
Fix type of nd_opt_home_agent_info_preference.
(cherry picked from commit 7ed520bd8504700cf4aaf3b06deb10575bfc546a)
-rw-r--r--ChangeLog5
-rw-r--r--inet/netinet/icmp6.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c999607cbb..d0912cccaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-15  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #10195]
+	* inet/netinet/icmp6.h (struct nd_opt_home_agent_info): Change type
+	of nd_opt_home_agent_info_preference to uint16_t.
+	Patch by Arnaud Ebalard <arno@natisbad.org>.
+
 	[BZ #10203]
 	* nis/nss_nis/nis-pwd.c (internal_nis_endpwent): Free all buffers,
 	not just the currently used one and those which follow.
diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h
index 0cb1aa6a6c..82893daa99 100644
--- a/inet/netinet/icmp6.h
+++ b/inet/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1997,2000,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1997,2000,2006,2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -339,7 +339,7 @@ struct nd_opt_home_agent_info
     uint8_t   nd_opt_home_agent_info_type;
     uint8_t   nd_opt_home_agent_info_len;
     uint16_t  nd_opt_home_agent_info_reserved;
-    int16_t   nd_opt_home_agent_info_preference;
+    uint16_t  nd_opt_home_agent_info_preference;
     uint16_t  nd_opt_home_agent_info_lifetime;
   };