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 @@ | |||
65 | [monitor.c session.c] | 65 | [monitor.c session.c] |
66 | missed these from last commit: | 66 | missed these from last commit: |
67 | move #include <sys/socket.h> out of includes.h | 67 | move #include <sys/socket.h> out of includes.h |
68 | - stevesk@cvs.openbsd.org 2006/07/08 23:30:06 | ||
69 | [log.c] | ||
70 | move user includes after /usr/include files | ||
68 | 71 | ||
69 | 20060706 | 72 | 20060706 |
70 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 73 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4798,4 +4801,4 @@ | |||
4798 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4801 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4799 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4802 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4800 | 4803 | ||
4801 | $Id: ChangeLog,v 1.4375 2006/07/10 11:08:34 djm Exp $ | 4804 | $Id: ChangeLog,v 1.4376 2006/07/10 11:09:22 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: log.c,v 1.31 2006/03/25 13:17:02 djm Exp $ */ | 1 | /* $OpenBSD: log.c,v 1.32 2006/07/08 23:30:06 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -36,14 +36,14 @@ | |||
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | 38 | ||
39 | #include "log.h" | ||
40 | #include "xmalloc.h" | ||
41 | |||
42 | #include <syslog.h> | 39 | #include <syslog.h> |
43 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) | 40 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) |
44 | # include <vis.h> | 41 | # include <vis.h> |
45 | #endif | 42 | #endif |
46 | 43 | ||
44 | #include "log.h" | ||
45 | #include "xmalloc.h" | ||
46 | |||
47 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 47 | static LogLevel log_level = SYSLOG_LEVEL_INFO; |
48 | static int log_on_stderr = 1; | 48 | static int log_on_stderr = 1; |
49 | static int log_facility = LOG_AUTH; | 49 | static int log_facility = LOG_AUTH; |
@@ -30,7 +30,6 @@ | |||
30 | #include <sys/types.h> | 30 | #include <sys/types.h> |
31 | #include <sys/socket.h> | 31 | #include <sys/socket.h> |
32 | #include <sys/wait.h> | 32 | #include <sys/wait.h> |
33 | #include <sys/socket.h> | ||
34 | 33 | ||
35 | #ifdef HAVE_PATHS_H | 34 | #ifdef HAVE_PATHS_H |
36 | #include <paths.h> | 35 | #include <paths.h> |