From 09a3319504b2620fcd05dbd9ab7b2918bb2f9699 Mon Sep 17 00:00:00 2001
From: ray <>
Date: Thu, 10 May 2007 02:14:35 +0000
Subject: Use syslog_r instead of syslog in getaddrinfo.  Slowly making
 getaddrinfo reentrant.

OK millert@ and deraadt@.
---
 src/lib/libc/net/getaddrinfo.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index 21f2094bfd..10a983afcf 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo.c,v 1.61 2007/02/18 19:03:11 ray Exp $	*/
+/*	$OpenBSD: getaddrinfo.c,v 1.62 2007/05/10 02:14:35 ray Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $	*/
 
 /*
@@ -1065,11 +1065,14 @@ getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
 				continue;
 			}
 		} else if (type != qtype) {
-			if (type != T_KEY && type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
+			if (type != T_KEY && type != T_SIG) {
+				struct syslog_data sdata = SYSLOG_DATA_INIT;
+
+				syslog_r(LOG_NOTICE|LOG_AUTH, &sdata,
 	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
 				       qname, p_class(C_IN), p_type(qtype),
 				       p_type(type));
+			}
 			cp += n;
 			continue;		/* XXX - had_error++ ? */
 		}
@@ -1077,7 +1080,9 @@ getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
 		case T_A:
 		case T_AAAA:
 			if (strcasecmp(canonname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
+				struct syslog_data sdata = SYSLOG_DATA_INIT;
+
+				syslog_r(LOG_NOTICE|LOG_AUTH, &sdata,
 				       AskedForGot, canonname, bp);
 				cp += n;
 				continue;	/* XXX - had_error++ ? */
-- 
cgit v1.2.3-55-g6feb