Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src Revert last libresolv change (ticket #887). That commit c...



details:   https://anonhg.NetBSD.org/src/rev/487f31ff898c
branches:  netbsd-6
changeset: 776365:487f31ff898c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Jun 14 04:17:36 2013 +0000

description:
Revert last libresolv change (ticket #887). That commit changed the major
version. It's not good. Discussed in current-users@

diffstat:

 distrib/sets/lists/base/ad.mips64eb |    10 +-
 distrib/sets/lists/base/ad.mips64el |    10 +-
 distrib/sets/lists/base/md.amd64    |     6 +-
 distrib/sets/lists/base/md.sparc64  |     6 +-
 distrib/sets/lists/base/shl.mi      |     6 +-
 distrib/sets/lists/comp/ad.mips64eb |     6 +-
 distrib/sets/lists/comp/ad.mips64el |     6 +-
 distrib/sets/lists/comp/md.amd64    |     4 +-
 distrib/sets/lists/comp/md.sparc64  |     4 +-
 distrib/sets/lists/comp/shl.mi      |     4 +-
 include/res_update.h                |     8 +-
 lib/libc/nameser/ns_samedomain.c    |    28 +-
 lib/libresolv/Makefile              |    19 +-
 lib/libresolv/dst_api.c             |  1058 -------------------------------
 lib/libresolv/dst_internal.h        |   166 ----
 lib/libresolv/hmac_link.c           |   472 --------------
 lib/libresolv/ns_date.c             |   134 ----
 lib/libresolv/ns_sign.c             |   393 -----------
 lib/libresolv/ns_verify.c           |   486 --------------
 lib/libresolv/res_findzonecut.c     |   723 ---------------------
 lib/libresolv/res_mkupdate.c        |  1169 -----------------------------------
 lib/libresolv/res_mkupdate.h        |    27 -
 lib/libresolv/res_private.h         |    24 -
 lib/libresolv/res_sendsigned.c      |   173 -----
 lib/libresolv/res_update.c          |   219 ------
 lib/libresolv/shlib_version         |     4 +-
 lib/libresolv/support.c             |   347 ----------
 27 files changed, 55 insertions(+), 5457 deletions(-)

diffs (truncated from 5851 to 300 lines):

diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb       Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb       Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.12 2013/06/14 04:17:36 msaitoh Exp $
 ./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic
 ./libexec/ld.elf_so-o32                                base-sysutil-bin        compat,pic
 ./usr/lib/64                                   base-compat-lib
@@ -209,8 +209,8 @@
 ./usr/lib/64/libradius.so.4.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/librefuse.so.2                    base-compat-shlib       compat,pic
 ./usr/lib/64/librefuse.so.2.0                  base-compat-shlib       compat,pic
-./usr/lib/64/libresolv.so.3                    base-compat-shlib       compat,pic
-./usr/lib/64/libresolv.so.3.0                  base-compat-shlib       compat,pic
+./usr/lib/64/libresolv.so.2                    base-compat-shlib       compat,pic
+./usr/lib/64/libresolv.so.2.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/libroken.so.19                    base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libroken.so.19.0                  base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/librpcsvc.so.1                    base-compat-shlib       compat,pic
@@ -517,8 +517,8 @@
 ./usr/lib/o32/libradius.so.4.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/librefuse.so.2                   base-compat-shlib       compat,pic
 ./usr/lib/o32/librefuse.so.2.0                 base-compat-shlib       compat,pic
-./usr/lib/o32/libresolv.so.3                   base-compat-shlib       compat,pic
-./usr/lib/o32/libresolv.so.3.0                 base-compat-shlib       compat,pic
+./usr/lib/o32/libresolv.so.2                   base-compat-shlib       compat,pic
+./usr/lib/o32/libresolv.so.2.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/libroken.so.19                   base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libroken.so.19.0                 base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/librpcsvc.so.1                   base-compat-shlib       compat,pic
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el       Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/base/ad.mips64el       Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.81.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64el,v 1.81.2.12 2013/06/14 04:17:36 msaitoh Exp $
 ./libexec/ld.elf_so-64                         base-compat-shlib       compat,pic
 ./libexec/ld.elf_so-o32                                base-sysutil-bin        compat,pic
 ./usr/lib/64                                   base-compat-lib
@@ -209,8 +209,8 @@
 ./usr/lib/64/libradius.so.4.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/librefuse.so.2                    base-compat-shlib       compat,pic
 ./usr/lib/64/librefuse.so.2.0                  base-compat-shlib       compat,pic
-./usr/lib/64/libresolv.so.3                    base-compat-shlib       compat,pic
-./usr/lib/64/libresolv.so.3.0                  base-compat-shlib       compat,pic
+./usr/lib/64/libresolv.so.2                    base-compat-shlib       compat,pic
+./usr/lib/64/libresolv.so.2.0                  base-compat-shlib       compat,pic
 ./usr/lib/64/libroken.so.19                    base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/libroken.so.19.0                  base-compat-shlib       compat,pic,kerberos
 ./usr/lib/64/librpcsvc.so.1                    base-compat-shlib       compat,pic
@@ -517,8 +517,8 @@
 ./usr/lib/o32/libradius.so.4.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/librefuse.so.2                   base-compat-shlib       compat,pic
 ./usr/lib/o32/librefuse.so.2.0                 base-compat-shlib       compat,pic
-./usr/lib/o32/libresolv.so.3                   base-compat-shlib       compat,pic
-./usr/lib/o32/libresolv.so.3.0                 base-compat-shlib       compat,pic
+./usr/lib/o32/libresolv.so.2                   base-compat-shlib       compat,pic
+./usr/lib/o32/libresolv.so.2.0                 base-compat-shlib       compat,pic
 ./usr/lib/o32/libroken.so.19                   base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/libroken.so.19.0                 base-compat-shlib       compat,pic,kerberos
 ./usr/lib/o32/librpcsvc.so.1                   base-compat-shlib       compat,pic
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64  Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/base/md.amd64  Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.amd64,v 1.156.2.12 2013/06/14 04:17:36 msaitoh Exp $
 ./dev/lms0                                     base-obsolete           obsolete
 ./dev/mms0                                     base-obsolete           obsolete
 ./libexec/ld.elf_so-i386                       base-sys-shlib          compat,pic
@@ -216,8 +216,8 @@
 ./usr/lib/i386/libradius.so.4.0                        base-compat-shlib       compat,pic
 ./usr/lib/i386/librefuse.so.2                  base-compat-shlib       compat,pic
 ./usr/lib/i386/librefuse.so.2.0                        base-compat-shlib       compat,pic
-./usr/lib/i386/libresolv.so.3                  base-compat-shlib       compat,pic
-./usr/lib/i386/libresolv.so.3.0                        base-compat-shlib       compat,pic
+./usr/lib/i386/libresolv.so.2                  base-compat-shlib       compat,pic
+./usr/lib/i386/libresolv.so.2.0                        base-compat-shlib       compat,pic
 ./usr/lib/i386/libroken.so.19                  base-compat-shlib       compat,pic,kerberos
 ./usr/lib/i386/libroken.so.19.0                        base-compat-shlib       compat,pic,kerberos
 ./usr/lib/i386/librpcsvc.so.1                  base-compat-shlib       compat,pic
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64        Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/base/md.sparc64        Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.147.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.sparc64,v 1.147.2.12 2013/06/14 04:17:36 msaitoh Exp $
 ./libexec/ld.elf_so-sparc                      base-sysutil-bin        compat,pic
 ./sbin/edlabel                                 base-sysutil-root       obsolete
 ./usr/bin/fdformat                             base-util-bin
@@ -212,8 +212,8 @@
 ./usr/lib/sparc/libradius.so.4.0               base-compat-shlib       compat,pic
 ./usr/lib/sparc/librefuse.so.2                 base-compat-shlib       compat,pic
 ./usr/lib/sparc/librefuse.so.2.0               base-compat-shlib       compat,pic
-./usr/lib/sparc/libresolv.so.3                 base-compat-shlib       compat,pic
-./usr/lib/sparc/libresolv.so.3.0               base-compat-shlib       compat,pic
+./usr/lib/sparc/libresolv.so.2                 base-compat-shlib       compat,pic
+./usr/lib/sparc/libresolv.so.2.0               base-compat-shlib       compat,pic
 ./usr/lib/sparc/libroken.so.19                 base-compat-shlib       compat,pic,kerberos
 ./usr/lib/sparc/libroken.so.19.0               base-compat-shlib       compat,pic,kerberos
 ./usr/lib/sparc/librpcsvc.so.1                 base-compat-shlib       compat,pic
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/base/shl.mi    Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.11 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.616.2.12 2013/06/14 04:17:36 msaitoh Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -402,8 +402,8 @@
 ./usr/lib/librefuse.so.2                       base-refuse-shlib
 ./usr/lib/librefuse.so.2.0                     base-refuse-shlib
 ./usr/lib/libresolv.so                         base-net-shlib
-./usr/lib/libresolv.so.3                       base-net-shlib
-./usr/lib/libresolv.so.3.0                     base-net-shlib
+./usr/lib/libresolv.so.2                       base-net-shlib
+./usr/lib/libresolv.so.2.0                     base-net-shlib
 ./usr/lib/libroken.so                          base-krb5-shlib         kerberos
 ./usr/lib/libroken.so.19                       base-krb5-shlib         kerberos
 ./usr/lib/libroken.so.19.0                     base-krb5-shlib         kerberos
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/comp/ad.mips64eb
--- a/distrib/sets/lists/comp/ad.mips64eb       Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/comp/ad.mips64eb       Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.69.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64eb,v 1.69.2.9 2013/06/14 04:17:36 msaitoh Exp $
 ./usr/bin/elf2aout                             comp-obsolete           obsolete
 ./usr/bin/elf2ecoff                            comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h               comp-c-include          gcccmds,gcc=45
@@ -1365,7 +1365,7 @@
 ./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libradius.so.4.0.debug  comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/librefuse.so.2.0.debug  comp-refuse-debug       debug,compat
-./usr/libdata/debug/usr/lib/64/libresolv.so.3.0.debug  comp-net-debug  debug,compat
+./usr/libdata/debug/usr/lib/64/libresolv.so.2.0.debug  comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libroken.so.14.0.debug  comp-compat-shlib        compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/64/libroken.so.19.0.debug  comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/librpcsvc.so.1.0.debug  comp-net-debug  debug,compat
@@ -1521,7 +1521,7 @@
 ./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug  comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libradius.so.4.0.debug comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/librefuse.so.2.0.debug comp-refuse-debug       debug,compat
-./usr/libdata/debug/usr/lib/o32/libresolv.so.3.0.debug comp-net-debug  debug,compat
+./usr/libdata/debug/usr/lib/o32/libresolv.so.2.0.debug comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libroken.so.14.0.debug comp-compat-shlib        compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/o32/libroken.so.19.0.debug comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/librpcsvc.so.1.0.debug comp-net-debug  debug,compat
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/comp/ad.mips64el
--- a/distrib/sets/lists/comp/ad.mips64el       Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/comp/ad.mips64el       Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.69.2.9 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: ad.mips64el,v 1.69.2.10 2013/06/14 04:17:36 msaitoh Exp $
 ./usr/bin/elf2aout                             comp-obsolete           obsolete
 ./usr/bin/elf2ecoff                            comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h               comp-c-include          gcccmds,gcc=45
@@ -1365,7 +1365,7 @@
 ./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug   comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libradius.so.4.0.debug  comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/librefuse.so.2.0.debug  comp-refuse-debug       debug,compat
-./usr/libdata/debug/usr/lib/64/libresolv.so.3.0.debug  comp-net-debug  debug,compat
+./usr/libdata/debug/usr/lib/64/libresolv.so.2.0.debug  comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/64/libroken.so.14.0.debug  comp-compat-shlib        compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/64/libroken.so.19.0.debug  comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/librpcsvc.so.1.0.debug  comp-net-debug  debug,compat
@@ -1521,7 +1521,7 @@
 ./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug  comp-sys-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libradius.so.4.0.debug comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/librefuse.so.2.0.debug comp-refuse-debug       debug,compat
-./usr/libdata/debug/usr/lib/o32/libresolv.so.3.0.debug comp-net-debug  debug,compat
+./usr/libdata/debug/usr/lib/o32/libresolv.so.2.0.debug comp-net-debug  debug,compat
 ./usr/libdata/debug/usr/lib/o32/libroken.so.14.0.debug comp-compat-shlib        compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/o32/libroken.so.19.0.debug comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/librpcsvc.so.1.0.debug comp-net-debug  debug,compat
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64  Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/comp/md.amd64  Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.amd64,v 1.155.2.9 2013/06/14 04:17:36 msaitoh Exp $
 ./usr/include/amd64                            comp-c-include
 ./usr/include/amd64/ansi.h                     comp-c-include
 ./usr/include/amd64/aout_machdep.h             comp-c-include
@@ -1139,7 +1139,7 @@
 ./usr/libdata/debug/usr/lib/i386/libquota.so.1.0.debug comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libradius.so.4.0.debug        comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/librefuse.so.2.0.debug        comp-compat-shlib       compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libresolv.so.3.0.debug        comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libresolv.so.2.0.debug        comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libroken.so.14.0.debug        comp-compat-shlib       compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/i386/libroken.so.19.0.debug        comp-compat-shlib       compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/librpcsvc.so.1.0.debug        comp-compat-shlib       compat,pic,debug
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/comp/md.sparc64
--- a/distrib/sets/lists/comp/md.sparc64        Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/comp/md.sparc64        Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.138.2.8 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: md.sparc64,v 1.138.2.9 2013/06/14 04:17:36 msaitoh Exp $
 ./usr/include/gcc-4.5/tgmath.h                 comp-c-include          gcccmds,gcc=45
 ./usr/include/ieeefp.h                         comp-c-include
 ./usr/include/sparc                            comp-c-include
@@ -977,7 +977,7 @@
 ./usr/libdata/debug/usr/lib/sparc/libquota.so.1.0.debug                        comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libradius.so.4.0.debug               comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/librefuse.so.2.0.debug               comp-compat-shlib       compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libresolv.so.3.0.debug               comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libresolv.so.2.0.debug               comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libroken.so.14.0.debug       comp-compat-shlib        compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/sparc/libroken.so.19.0.debug       comp-compat-shlib        compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/sparc/librpcsvc.so.1.0.debug               comp-compat-shlib       compat,pic,debug
diff -r 14330c76d2f5 -r 487f31ff898c distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Thu Jun 13 10:24:05 2013 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.13 2013/06/13 04:20:30 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.209.2.14 2013/06/14 04:17:36 msaitoh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -334,7 +334,7 @@
 ./usr/libdata/debug/usr/lib/libquota.so.1.0.debug      comp-sys-debug  debug
 ./usr/libdata/debug/usr/lib/libradius.so.4.0.debug     comp-net-debug  debug
 ./usr/libdata/debug/usr/lib/librefuse.so.2.0.debug     comp-refuse-debug       debug
-./usr/libdata/debug/usr/lib/libresolv.so.3.0.debug     comp-net-debug  debug
+./usr/libdata/debug/usr/lib/libresolv.so.2.0.debug     comp-net-debug  debug
 ./usr/libdata/debug/usr/lib/libroken.so.19.0.debug     comp-krb5-debug kerberos,debug
 ./usr/libdata/debug/usr/lib/librpcsvc.so.1.0.debug     comp-net-debug  debug
 ./usr/libdata/debug/usr/lib/librt.so.1.0.debug         comp-sys-debug  debug
diff -r 14330c76d2f5 -r 487f31ff898c include/res_update.h
--- a/include/res_update.h      Thu Jun 13 10:24:05 2013 +0000
+++ b/include/res_update.h      Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: res_update.h,v 1.7.10.1 2013/06/13 04:20:30 msaitoh Exp $      */
+/*     $NetBSD: res_update.h,v 1.7.10.2 2013/06/14 04:17:36 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -26,14 +26,14 @@
 
 #include <sys/types.h>
 #include <arpa/nameser.h>
-#include <sys/queue.h>
+#include <isc/list.h>
 #include <resolv.h>
 
 /*%
  * This RR-like structure is particular to UPDATE.
  */
 struct ns_updrec {
-       TAILQ_ENTRY(ns_updrec) r_link, r_glink;
+       LINK(struct ns_updrec) r_link, r_glink;
        ns_sect         r_section;      /*%< ZONE/PREREQUISITE/UPDATE */
        char *          r_dname;        /*%< owner of the RR */
        ns_class        r_class;        /*%< class number */
@@ -48,7 +48,7 @@
        u_int           r_zone;         /*%< zone number on server */
 };
 typedef struct ns_updrec ns_updrec;
-typedef        TAILQ_HEAD(ns_updqueu, ns_updrec) ns_updque;
+typedef        LIST(ns_updrec) ns_updque;
 
 #define res_mkupdate           __res_mkupdate
 #define res_update             __res_update
diff -r 14330c76d2f5 -r 487f31ff898c lib/libc/nameser/ns_samedomain.c
--- a/lib/libc/nameser/ns_samedomain.c  Thu Jun 13 10:24:05 2013 +0000
+++ b/lib/libc/nameser/ns_samedomain.c  Fri Jun 14 04:17:36 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ns_samedomain.c,v 1.6.8.1 2013/06/13 04:20:30 msaitoh Exp $    */
+/*     $NetBSD: ns_samedomain.c,v 1.6.8.2 2013/06/14 04:17:36 msaitoh Exp $    */
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp";
 #else
-__RCSID("$NetBSD: ns_samedomain.c,v 1.6.8.1 2013/06/13 04:20:30 msaitoh Exp $");
+__RCSID("$NetBSD: ns_samedomain.c,v 1.6.8.2 2013/06/14 04:17:36 msaitoh Exp $");
 #endif
 #endif
 
@@ -35,7 +35,7 @@
 
 #include "port_after.h"
 
-#ifdef _LIBRESOLV
+#ifndef _LIBC
 /*%
  *     Check whether a name belongs to a domain.
  *
@@ -57,8 +57,8 @@
 
 int
 ns_samedomain(const char *a, const char *b) {
-       size_t la, lb, i;
-       int diff, escaped;
+       size_t la, lb;
+       int diff, i, escaped;



Home | Main Index | Thread Index | Old Index