From 225c5452c3c722fc526f1e0b07518082bf72272e Mon Sep 17 00:00:00 2001
From: ghen <ghen@NetBSD.org>
Date: Fri, 30 Mar 2007 20:23:03 +0000
Subject: [PATCH] Resolve conflicts.

---
 lib/libc/include/isc/list.h      |   2 +-
 lib/libc/inet/inet_cidr_ntop.c   |   4 +-
 lib/libc/inet/inet_cidr_pton.c   |   4 +-
 lib/libc/inet/inet_ntop.c        |   4 +-
 lib/libc/inet/inet_pton.c        |   4 +-
 lib/libc/inet/nsap_addr.c        |   4 +-
 lib/libc/isc/assertions.c        |   5 +-
 lib/libc/isc/ev_streams.c        |   4 +-
 lib/libc/isc/ev_timers.c         |   4 +-
 lib/libc/nameser/ns_name.c       |   4 +-
 lib/libc/nameser/ns_netint.c     |   4 +-
 lib/libc/nameser/ns_parse.c      |   4 +-
 lib/libc/nameser/ns_print.c      |   4 +-
 lib/libc/nameser/ns_samedomain.c |   4 +-
 lib/libc/nameser/ns_ttl.c        |   4 +-
 lib/libc/net/base64.c            |   4 +-
 lib/libc/resolv/herror.c         |   4 +-
 lib/libc/resolv/mtctxres.c       | 130 -------------------------------
 lib/libc/resolv/res_comp.c       |   4 +-
 lib/libc/resolv/res_data.c       |   4 +-
 lib/libc/resolv/res_debug.c      |   4 +-
 lib/libc/resolv/res_init.c       |   4 +-
 lib/libc/resolv/res_mkquery.c    |   4 +-
 lib/libc/resolv/res_query.c      |   4 +-
 lib/libc/resolv/res_send.c       |   4 +-
 25 files changed, 47 insertions(+), 178 deletions(-)
 delete mode 100644 lib/libc/resolv/mtctxres.c

diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
index 68d4ef06d1fb..ac07833a19d7 100644
--- a/lib/libc/include/isc/list.h
+++ b/lib/libc/include/isc/list.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: list.h,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: list.h,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
index 945036968f8c..ee76ef80cc13 100644
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ b/lib/libc/inet/inet_cidr_ntop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_cidr_ntop.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: inet_cidr_ntop.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #if 0
 static const char rcsid[] = "Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:47 marka Exp";
 #else
-__RCSID("$NetBSD: inet_cidr_ntop.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: inet_cidr_ntop.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
index 3899360419c5..f2f6e431e457 100644
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_cidr_pton.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: inet_cidr_pton.c,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #if 0
 static const char rcsid[] = "Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:53 sra Exp";
 #else
-__RCSID("$NetBSD: inet_cidr_pton.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: inet_cidr_pton.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index cfc88e39c8a7..c4c4c9f9e287 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_ntop.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: inet_ntop.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #if 0
 static const char rcsid[] = "Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp";
 #else
-__RCSID("$NetBSD: inet_ntop.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: inet_ntop.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index 1af39582cc11..09660d1b0428 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_pton.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: inet_pton.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #if 0
 static const char rcsid[] = "Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 marka Exp";
 #else
-__RCSID("$NetBSD: inet_pton.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: inet_pton.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index 1ea426d999a2..a34697bee6cb 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nsap_addr.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: nsap_addr.c,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #if 0
 static const char rcsid[] = "Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 marka Exp";
 #else
-__RCSID("$NetBSD: nsap_addr.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: nsap_addr.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/isc/assertions.c b/lib/libc/isc/assertions.c
index 2dbe7d0881a9..77ee4ced3ac0 100644
--- a/lib/libc/isc/assertions.c
+++ b/lib/libc/isc/assertions.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: assertions.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: assertions.c,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: assertions.c,v 1.2.18.1 2005/04/27 05:01:05 sra Exp";
 #else
-__RCSID("$NetBSD: assertions.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: assertions.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
@@ -85,7 +85,6 @@ assertion_type_to_text(assertion_type type) {
  * Private.
  */
 
-/* coverity[+kill] */
 static void
 default_assertion_failed(const char *file, int line, assertion_type type,
 			 const char *cond, int print_errno)
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
index 551f56ebfefc..86164ddfb025 100644
--- a/lib/libc/isc/ev_streams.c
+++ b/lib/libc/isc/ev_streams.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ev_streams.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ev_streams.c,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -26,7 +26,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp";
 #else
-__RCSID("$NetBSD: ev_streams.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ev_streams.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
index 8b6326ef2d2d..f73c9caf9ea0 100644
--- a/lib/libc/isc/ev_timers.c
+++ b/lib/libc/isc/ev_timers.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ev_timers.c,v 1.4 2007/01/28 01:43:52 christos Exp $	*/
+/*	$NetBSD: ev_timers.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -26,7 +26,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp";
 #else
-__RCSID("$NetBSD: ev_timers.c,v 1.4 2007/01/28 01:43:52 christos Exp $");
+__RCSID("$NetBSD: ev_timers.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
index 10bf342c3b73..46e4c8bbb33c 100644
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_name.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_name.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_name.c,v 1.8.18.2 2005/04/27 05:01:08 sra Exp";
 #else
-__RCSID("$NetBSD: ns_name.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_name.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
index a99f4564c080..7ee115b4eac0 100644
--- a/lib/libc/nameser/ns_netint.c
+++ b/lib/libc/nameser/ns_netint.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_netint.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_netint.c,v 1.4 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_netint.c,v 1.2.18.1 2005/04/27 05:01:08 sra Exp";
 #else
-__RCSID("$NetBSD: ns_netint.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_netint.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index d5ea6cec6609..ae523576c2ec 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_parse.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_parse.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp";
 #else
-__RCSID("$NetBSD: ns_parse.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_parse.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 9b0b8818b812..3717eacc0a7f 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_print.c,v 1.6 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_print.c,v 1.7 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_print.c,v 1.6.18.4 2005/04/27 05:01:09 sra Exp";
 #else
-__RCSID("$NetBSD: ns_print.c,v 1.6 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_print.c,v 1.7 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index 7bccebe03712..3273cf3ba079 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_samedomain.c,v 1.3 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_samedomain.c,v 1.4 2007/03/30 20:23:03 ghen 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.5.18.1 2005/04/27 05:01:09 sra Exp";
 #else
-__RCSID("$NetBSD: ns_samedomain.c,v 1.3 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_samedomain.c,v 1.4 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
index b2fc78e29036..e4343a724656 100644
--- a/lib/libc/nameser/ns_ttl.c
+++ b/lib/libc/nameser/ns_ttl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns_ttl.c,v 1.4 2007/01/27 22:26:43 christos Exp $	*/
+/*	$NetBSD: ns_ttl.c,v 1.5 2007/03/30 20:23:03 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: ns_ttl.c,v 1.2.18.2 2005/07/28 07:38:10 marka Exp";
 #else
-__RCSID("$NetBSD: ns_ttl.c,v 1.4 2007/01/27 22:26:43 christos Exp $");
+__RCSID("$NetBSD: ns_ttl.c,v 1.5 2007/03/30 20:23:03 ghen Exp $");
 #endif
 #endif
 
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 3c92ca4123bd..140b9e1b58e2 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: base64.c,v 1.9 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: base64.c,v 1.10 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -47,7 +47,7 @@
 #if 0
 static const char rcsid[] = "Id: base64.c,v 1.3.18.1 2005/04/27 05:01:05 sra Exp";
 #else
-__RCSID("$NetBSD: base64.c,v 1.9 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: base64.c,v 1.10 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index d7c76a2d0697..9519d71076da 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: herror.c,v 1.5 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: herror.c,v 1.6 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -55,7 +55,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: herror.c,v 1.3.18.1 2005/04/27 05:01:09 sra Exp";
 #else
-__RCSID("$NetBSD: herror.c,v 1.5 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: herror.c,v 1.6 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c
deleted file mode 100644
index 1153dc5b76ef..000000000000
--- a/lib/libc/resolv/mtctxres.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: mtctxres.c,v 1.2 2007/01/28 02:14:05 christos Exp $	*/
-
-#include <port_before.h>
-#ifdef DO_PTHREADS
-#include <pthread.h>
-#endif
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <resolv_mt.h>
-#include <port_after.h>
-
-#ifdef DO_PTHREADS
-static pthread_key_t	key;
-static int		mt_key_initialized = 0;
-
-static int		__res_init_ctx(void);
-static void		__res_destroy_ctx(void *);
-
-#if defined(sun) && !defined(__GNUC__)
-#pragma init	(_mtctxres_init)
-#endif
-#endif
-
-static mtctxres_t	sharedctx;
-
-#ifdef DO_PTHREADS
-/*
- * Initialize the TSD key. By doing this at library load time, we're
- * implicitly running without interference from other threads, so there's
- * no need for locking.
- */
-static void
-_mtctxres_init(void) {
-	int pthread_keycreate_ret;
-
-	pthread_keycreate_ret = pthread_key_create(&key, __res_destroy_ctx);
-	if (pthread_keycreate_ret == 0)
-		mt_key_initialized = 1;
-}
-#endif
-
-/*
- * To support binaries that used the private MT-safe interface in
- * Solaris 8, we still need to provide the __res_enable_mt()
- * and __res_disable_mt() entry points. They're do-nothing routines.
- */
-int
-__res_enable_mt(void) {
-	return (-1);
-}
-
-int
-__res_disable_mt(void) {
-	return (0);
-}
-
-#ifdef DO_PTHREADS
-static int
-__res_init_ctx(void) {
-
-	mtctxres_t	*mt;
-	int		ret;
-
-
-	if (pthread_getspecific(key) != 0) {
-		/* Already exists */
-		return (0);
-	}
-
-	if ((mt = malloc(sizeof (mtctxres_t))) == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	memset(mt, 0, sizeof (mtctxres_t));
-
-	if ((ret = pthread_setspecific(key, mt)) != 0) {
-		free(mt);
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-static void
-__res_destroy_ctx(void *value) {
-
-	mtctxres_t	*mt = (mtctxres_t *)value;
-
-	if (mt != 0)
-		free(mt);
-}
-#endif
-
-mtctxres_t *
-___mtctxres(void) {
-#ifdef DO_PTHREADS
-	mtctxres_t	*mt;
-
-	/*
-	 * This if clause should only be executed if we are linking
-	 * statically.  When linked dynamically _mtctxres_init() should
-	 * be called at binding time due the #pragma above.
-	 */
-	if (!mt_key_initialized) {
-		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                if (pthread_mutex_lock(&keylock) == 0) {
-			_mtctxres_init();
-			(void) pthread_mutex_unlock(&keylock);
-		}
-	}
-
-	/*
-	 * If we have already been called in this thread return the existing
-	 * context.  Otherwise recreat a new context and return it.  If
-	 * that fails return a global context.
-	 */
-	if (mt_key_initialized) {
-		if (((mt = pthread_getspecific(key)) != 0) ||
-		    (__res_init_ctx() == 0 &&
-		     (mt = pthread_getspecific(key)) != 0)) {
-			return (mt);
-		}
-	}
-#endif
-	return (&sharedctx);
-}
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index ce144178d0cc..63a3ddb7f84a 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_comp.c,v 1.7 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: res_comp.c,v 1.8 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 1985, 1993
@@ -75,7 +75,7 @@
 static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp";
 #else
-__RCSID("$NetBSD: res_comp.c,v 1.7 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: res_comp.c,v 1.8 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index ddb42b9764f3..d07bb7312ff1 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_data.c,v 1.9 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: res_data.c,v 1.10 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -22,7 +22,7 @@
 #ifdef notdef
 static const char rcsid[] = "Id: res_data.c,v 1.3.18.1 2005/04/27 05:01:10 sra Exp";
 #else
-__RCSID("$NetBSD: res_data.c,v 1.9 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: res_data.c,v 1.10 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index f15bfa1abf30..f5834ccf675d 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_debug.c,v 1.8 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: res_debug.c,v 1.9 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 1985
@@ -101,7 +101,7 @@
 static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp";
 #else
-__RCSID("$NetBSD: res_debug.c,v 1.8 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: res_debug.c,v 1.9 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 6b1a25c1907d..2a218d85d9fe 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_init.c,v 1.12 2007/02/09 22:29:40 christos Exp $	*/
+/*	$NetBSD: res_init.c,v 1.13 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static const char rcsid[] = "Id: res_init.c,v 1.16.18.5 2006/08/30 23:23:13 marka Exp";
 #else
-__RCSID("$NetBSD: res_init.c,v 1.12 2007/02/09 22:29:40 christos Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.13 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index e52b2874b9af..e7b6900de6d2 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_mkquery.c,v 1.7 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: res_mkquery.c,v 1.8 2007/03/30 20:23:04 ghen Exp $	*/
 
 /*
  * Copyright (c) 1985, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp";
 #else
-__RCSID("$NetBSD: res_mkquery.c,v 1.7 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: res_mkquery.c,v 1.8 2007/03/30 20:23:04 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 05fae123466b..49fa8ef2fc17 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_query.c,v 1.8 2007/01/27 22:26:44 christos Exp $	*/
+/*	$NetBSD: res_query.c,v 1.9 2007/03/30 20:23:05 ghen Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_query.c,v 1.7.18.1 2005/04/27 05:01:11 sra Exp";
 #else
-__RCSID("$NetBSD: res_query.c,v 1.8 2007/01/27 22:26:44 christos Exp $");
+__RCSID("$NetBSD: res_query.c,v 1.9 2007/03/30 20:23:05 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index d79e445f5378..3375b11bdc4b 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: res_send.c,v 1.12 2007/03/02 22:56:15 christos Exp $	*/
+/*	$NetBSD: res_send.c,v 1.13 2007/03/30 20:23:05 ghen Exp $	*/
 
 /*
  * Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_send.c,v 1.9.18.8 2006/10/16 23:00:58 marka Exp";
 #else
-__RCSID("$NetBSD: res_send.c,v 1.12 2007/03/02 22:56:15 christos Exp $");
+__RCSID("$NetBSD: res_send.c,v 1.13 2007/03/30 20:23:05 ghen Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */