diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | log.c | 8 | ||||
| -rw-r--r-- | monitor.c | 1 |
3 files changed, 8 insertions, 6 deletions
@@ -65,6 +65,9 @@ [monitor.c session.c] missed these from last commit: move #include <sys/socket.h> out of includes.h + - stevesk@cvs.openbsd.org 2006/07/08 23:30:06 + [log.c] + move user includes after /usr/include files 20060706 - (dtucker) [configure.ac] Try AIX blibpath test in different order when @@ -4798,4 +4801,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4375 2006/07/10 11:08:34 djm Exp $ +$Id: ChangeLog,v 1.4376 2006/07/10 11:09:22 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.31 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: log.c,v 1.32 2006/07/08 23:30:06 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -36,14 +36,14 @@ #include "includes.h" -#include "log.h" -#include "xmalloc.h" - #include <syslog.h> #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) # include <vis.h> #endif +#include "log.h" +#include "xmalloc.h" + static LogLevel log_level = SYSLOG_LEVEL_INFO; static int log_on_stderr = 1; static int log_facility = LOG_AUTH; @@ -30,7 +30,6 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/wait.h> -#include <sys/socket.h> #ifdef HAVE_PATHS_H #include <paths.h> |