From 1083e07a5060a06f08f02157bc02d28e11ac3070 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Thu, 2 Nov 2006 20:36:29 +0000
Subject: [PATCH] - verify that the log file is usable, otherwise re-open it. -
 if the file is re-opened, clear the connected flag. - don't check that the
 file is opened before connecting, because the   file will be opened then.

---
 lib/libc/gen/syslog.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 808f34cc77ec..f4fce93950d7 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslog.c,v 1.35 2006/10/27 21:36:50 christos Exp $	*/
+/*	$NetBSD: syslog.c,v 1.36 2006/11/02 20:36:29 christos Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: syslog.c,v 1.35 2006/10/27 21:36:50 christos Exp $");
+__RCSID("$NetBSD: syslog.c,v 1.36 2006/11/02 20:36:29 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -370,12 +370,13 @@ connectlog_r(struct syslog_data *data)
 		.sun_path = _PATH_LOG,
 	};
 
-	if (data->log_file == -1) {
+	if (data->log_file == -1 || fcntl(data->log_file, F_GETFL, 0) == -1) {
 		if ((data->log_file = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
 			return;
 		(void)fcntl(data->log_file, F_SETFD, 1);
+		data->connected = 0;
 	}
-	if (data->log_file != -1 && !data->connected) {
+	if (!data->connected) {
 		if (connect(data->log_file,
 		    (const struct sockaddr *)(const void *)&sun,
 		    sizeof(sun)) == -1) {