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

[log.c]
     save and restore errno when logging; ok deraadt@
This commit is contained in:
Darren Tucker 2007-05-20 15:08:15 +10:00
parent f78bb41772
commit 36b78000a7
2 changed files with 8 additions and 2 deletions

View File

@ -12,6 +12,9 @@
- dtucker@cvs.openbsd.org 2007/04/23 10:15:39 - dtucker@cvs.openbsd.org 2007/04/23 10:15:39
[servconf.c] [servconf.c]
Remove debug() left over from development. ok deraadt@ 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 20070509
- (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h.
@ -2912,4 +2915,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4663 2007/05/20 05:03:15 dtucker Exp $ $Id: ChangeLog,v 1.4664 2007/05/20 05:08:15 dtucker Exp $

5
log.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -44,6 +44,7 @@
#include <string.h> #include <string.h>
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
# include <vis.h> # include <vis.h>
#endif #endif
@ -313,6 +314,7 @@ do_log(LogLevel level, const char *fmt, va_list args)
char fmtbuf[MSGBUFSIZ]; char fmtbuf[MSGBUFSIZ];
char *txt = NULL; char *txt = NULL;
int pri = LOG_INFO; int pri = LOG_INFO;
int saved_errno = errno;
if (level > log_level) if (level > log_level)
return; return;
@ -373,4 +375,5 @@ do_log(LogLevel level, const char *fmt, va_list args)
closelog(); closelog();
#endif #endif
} }
errno = saved_errno;
} }