diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-17 03:47:20 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-17 03:47:20 +0000 |
commit | 49a79c09762613f29601ef2470d13952168021be (patch) | |
tree | 140539420c10c5b358481cadcec495a5a41103fd /log-server.c | |
parent | baaa2c05dd789bdce64fa7eb5697a5f969d68288 (diff) |
- (stevek) Reworked progname support.
- (bal) Misplaced #include "includes.h" in bsd-setproctitle.c. Patch by
Shinichi Maruyama <marya@st.jip.co.jp>
I assume the progname patch was finished. I believe stevek is on vacation,
but it passes compiling under Linux and NeXTStep.
Diffstat (limited to 'log-server.c')
-rw-r--r-- | log-server.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/log-server.c b/log-server.c index 270a3c698..de3d5cfeb 100644 --- a/log-server.c +++ b/log-server.c | |||
@@ -43,12 +43,6 @@ RCSID("$OpenBSD: log-server.c,v 1.17 2000/09/12 20:53:10 markus Exp $"); | |||
43 | #include "xmalloc.h" | 43 | #include "xmalloc.h" |
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | 45 | ||
46 | #ifdef HAVE___PROGNAME | ||
47 | extern char *__progname; | ||
48 | #else /* HAVE___PROGNAME */ | ||
49 | static const char *__progname = "sshd"; | ||
50 | #endif /* HAVE___PROGNAME */ | ||
51 | |||
52 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 46 | static LogLevel log_level = SYSLOG_LEVEL_INFO; |
53 | static int log_on_stderr = 0; | 47 | static int log_on_stderr = 0; |
54 | static int log_facility = LOG_AUTH; | 48 | static int log_facility = LOG_AUTH; |
@@ -129,6 +123,7 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
129 | char fmtbuf[MSGBUFSIZ]; | 123 | char fmtbuf[MSGBUFSIZ]; |
130 | char *txt = NULL; | 124 | char *txt = NULL; |
131 | int pri = LOG_INFO; | 125 | int pri = LOG_INFO; |
126 | extern char *__progname; | ||
132 | 127 | ||
133 | if (level > log_level) | 128 | if (level > log_level) |
134 | return; | 129 | return; |