diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-15 17:10:57 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-15 17:10:57 +1100 |
commit | 3f905872b0d15be24078c4db131f0ecdb5ebb5e6 (patch) | |
tree | 700210571ddc52d55dcbaabf593e52b5d7531c3f /log-server.c | |
parent | c6d5ce86a9ed296dbc99b8fc593099a87830fd18 (diff) |
- Merged more Solaris compability from Marc G. Fournier
<marc.fournier@acadiau.ca>
- Wrote autoconf tests for __progname symbol
Diffstat (limited to 'log-server.c')
-rw-r--r-- | log-server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/log-server.c b/log-server.c index 805df6b6f..42f567af4 100644 --- a/log-server.c +++ b/log-server.c | |||
@@ -15,13 +15,19 @@ to the system log. | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: log-server.c,v 1.3 1999/11/15 04:25:10 damien Exp $"); | 18 | RCSID("$Id: log-server.c,v 1.4 1999/11/15 06:10:57 damien Exp $"); |
19 | 19 | ||
20 | #include <syslog.h> | 20 | #include <syslog.h> |
21 | #include "packet.h" | 21 | #include "packet.h" |
22 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
23 | #include "ssh.h" | 23 | #include "ssh.h" |
24 | 24 | ||
25 | #ifdef HAVE___PROGNAME | ||
26 | extern char *__progname; | ||
27 | #else /* HAVE___PROGNAME */ | ||
28 | const char *__progname = "sshd"; | ||
29 | #endif /* HAVE___PROGNAME */ | ||
30 | |||
25 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 31 | static LogLevel log_level = SYSLOG_LEVEL_INFO; |
26 | static int log_on_stderr = 0; | 32 | static int log_on_stderr = 0; |
27 | static int log_facility = LOG_AUTH; | 33 | static int log_facility = LOG_AUTH; |
@@ -104,7 +110,6 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
104 | char fmtbuf[MSGBUFSIZE]; | 110 | char fmtbuf[MSGBUFSIZE]; |
105 | char *txt = NULL; | 111 | char *txt = NULL; |
106 | int pri = LOG_INFO; | 112 | int pri = LOG_INFO; |
107 | extern char *__progname; | ||
108 | 113 | ||
109 | if (level > log_level) | 114 | if (level > log_level) |
110 | return; | 115 | return; |