diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
commit | 00ed3326c2fac75592e173e9d731452e9bb769ff (patch) | |
tree | 749aa90fd85da4971d09bc7cb69d79ac7e1ea580 /libc/resolv | |
parent | 28c5710e0d8071ca674ea390549c1b9e969ccde2 (diff) | |
download | eglibc2-00ed3326c2fac75592e173e9d731452e9bb769ff.tar.gz |
Merge changes between r22062 and r22176 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22177 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv')
-rw-r--r-- | libc/resolv/Makefile | 3 | ||||
-rw-r--r-- | libc/resolv/gai_cancel.c | 2 | ||||
-rw-r--r-- | libc/resolv/gai_error.c | 2 | ||||
-rw-r--r-- | libc/resolv/gai_misc.c | 2 | ||||
-rw-r--r-- | libc/resolv/gai_misc.h | 2 | ||||
-rw-r--r-- | libc/resolv/gai_notify.c | 2 | ||||
-rw-r--r-- | libc/resolv/gai_sigqueue.c | 2 | ||||
-rw-r--r-- | libc/resolv/gai_suspend.c | 2 | ||||
-rw-r--r-- | libc/resolv/getaddrinfo_a.c | 2 | ||||
-rw-r--r-- | libc/resolv/netdb.h | 2 | ||||
-rw-r--r-- | libc/resolv/nss_dns/dns-canon.c | 2 | ||||
-rw-r--r-- | libc/resolv/nss_dns/dns-host.c | 2 | ||||
-rw-r--r-- | libc/resolv/nss_dns/dns-network.c | 3 | ||||
-rw-r--r-- | libc/resolv/res-state.c | 2 | ||||
-rw-r--r-- | libc/resolv/res_hconf.c | 3 | ||||
-rw-r--r-- | libc/resolv/res_hconf.h | 2 | ||||
-rw-r--r-- | libc/resolv/tst-leaks.c | 2 | ||||
-rw-r--r-- | libc/resolv/tst-leaks2.c | 2 |
18 files changed, 18 insertions, 21 deletions
diff --git a/libc/resolv/Makefile b/libc/resolv/Makefile index 2b2fcd656..edc4b0d71 100644 --- a/libc/resolv/Makefile +++ b/libc/resolv/Makefile @@ -1,5 +1,4 @@ -# Copyright (C) 1994-2001,2003,2004,2007,2008,2011,2012 -# Free Software Foundation, Inc. +# Copyright (C) 1994-2013 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 diff --git a/libc/resolv/gai_cancel.c b/libc/resolv/gai_cancel.c index 908238101..e625a913f 100644 --- a/libc/resolv/gai_cancel.c +++ b/libc/resolv/gai_cancel.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/gai_error.c b/libc/resolv/gai_error.c index 9803b6753..80c542907 100644 --- a/libc/resolv/gai_error.c +++ b/libc/resolv/gai_error.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/gai_misc.c b/libc/resolv/gai_misc.c index 35f1133e6..6b73aac09 100644 --- a/libc/resolv/gai_misc.c +++ b/libc/resolv/gai_misc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2012 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/gai_misc.h b/libc/resolv/gai_misc.h index 1def6a329..a7ba463e2 100644 --- a/libc/resolv/gai_misc.h +++ b/libc/resolv/gai_misc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/gai_notify.c b/libc/resolv/gai_notify.c index 0af0206b0..9e4bdf667 100644 --- a/libc/resolv/gai_notify.c +++ b/libc/resolv/gai_notify.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/gai_sigqueue.c b/libc/resolv/gai_sigqueue.c index 56f00b9fb..ec2a1e7e8 100644 --- a/libc/resolv/gai_sigqueue.c +++ b/libc/resolv/gai_sigqueue.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 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 diff --git a/libc/resolv/gai_suspend.c b/libc/resolv/gai_suspend.c index dc7356980..a61a33785 100644 --- a/libc/resolv/gai_suspend.c +++ b/libc/resolv/gai_suspend.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/getaddrinfo_a.c b/libc/resolv/getaddrinfo_a.c index f1070d61e..4ea803df3 100644 --- a/libc/resolv/getaddrinfo_a.c +++ b/libc/resolv/getaddrinfo_a.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2001-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. diff --git a/libc/resolv/netdb.h b/libc/resolv/netdb.h index 41cf06f07..412343b42 100644 --- a/libc/resolv/netdb.h +++ b/libc/resolv/netdb.h @@ -1,4 +1,4 @@ - /* Copyright (C) 1996-2004, 2009-2011, 2012 Free Software Foundation, Inc. + /* Copyright (C) 1996-2013 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 diff --git a/libc/resolv/nss_dns/dns-canon.c b/libc/resolv/nss_dns/dns-canon.c index bb5650aa6..090ed7dda 100644 --- a/libc/resolv/nss_dns/dns-canon.c +++ b/libc/resolv/nss_dns/dns-canon.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2004-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. diff --git a/libc/resolv/nss_dns/dns-host.c b/libc/resolv/nss_dns/dns-host.c index f78b87990..af5c166da 100644 --- a/libc/resolv/nss_dns/dns-host.c +++ b/libc/resolv/nss_dns/dns-host.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2012 Free Software Foundation, Inc. +/* Copyright (C) 1996-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996. diff --git a/libc/resolv/nss_dns/dns-network.c b/libc/resolv/nss_dns/dns-network.c index 4c590baba..5c725b5f6 100644 --- a/libc/resolv/nss_dns/dns-network.c +++ b/libc/resolv/nss_dns/dns-network.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2002,2004,2007,2008,2011 - Free Software Foundation, Inc. +/* Copyright (C) 1996-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996. diff --git a/libc/resolv/res-state.c b/libc/resolv/res-state.c index 3a2a4d564..e53ba51a2 100644 --- a/libc/resolv/res-state.c +++ b/libc/resolv/res-state.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 97, 98, 2002, 2003, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1996-2013 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 diff --git a/libc/resolv/res_hconf.c b/libc/resolv/res_hconf.c index d23c9b903..8ac46380a 100644 --- a/libc/resolv/res_hconf.c +++ b/libc/resolv/res_hconf.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1993,1995-2006,2007,2009,2011 - Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). diff --git a/libc/resolv/res_hconf.h b/libc/resolv/res_hconf.h index 90c56eb61..ea207ab66 100644 --- a/libc/resolv/res_hconf.h +++ b/libc/resolv/res_hconf.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995-1998, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). diff --git a/libc/resolv/tst-leaks.c b/libc/resolv/tst-leaks.c index 4e47a6a12..7a1183819 100644 --- a/libc/resolv/tst-leaks.c +++ b/libc/resolv/tst-leaks.c @@ -1,5 +1,5 @@ /* Tests for res_query in libresolv - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003-2013 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 diff --git a/libc/resolv/tst-leaks2.c b/libc/resolv/tst-leaks2.c index b098e8af5..582000a89 100644 --- a/libc/resolv/tst-leaks2.c +++ b/libc/resolv/tst-leaks2.c @@ -1,5 +1,5 @@ /* Tests for res_init in libresolv - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004-2013 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 |