- djm@cvs.openbsd.org 2007/05/17 07:50:31

     [log.c]
     save and restore errno when logging; ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index 57055c96f42b35c4169244cf7786d8590940072d..1f9a101f87a531521601b5e11881d4ede34a1be4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
    - dtucker@cvs.openbsd.org 2007/04/23 10:15:39
      [servconf.c]
      Remove debug() left over from development.  ok deraadt@
+   - djm@cvs.openbsd.org 2007/05/17 07:50:31
+     [log.c]
+     save and restore errno when logging; ok deraadt@
 
 20070509
  - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.

diff --git a/log.c b/log.c
index 7f8867482d95e55d9cd6ff471cf504163c31d775..fae5b043f3e55701a9ca1d8a99aa9791e2513bff 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.39 2006/08/18 09:13:25 deraadt Exp $ */
+/* $OpenBSD: log.c,v 1.40 2007/05/17 07:50:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
+#include <errno.h>
 #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
 # include <vis.h>
 #endif
@@ -313,6 +314,7 @@ do_log(LogLevel level, const char *fmt, va_list args)
        char fmtbuf[MSGBUFSIZ];
        char *txt = NULL;
        int pri = LOG_INFO;
+       int saved_errno = errno;
 
        if (level > log_level)
                return;
@@ -373,4 +375,5 @@ do_log(LogLevel level, const char *fmt, va_list args)
                closelog();
 #endif
        }
+       errno = saved_errno;
 }