summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-03-09 20:12:47 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-03-09 20:12:47 +1100
commit835903da7bc133033186765c4a31421016de0895 (patch)
tree7c1253dea3b67b210266f6735a57c88d2abe5925
parentb2169235c79c3c58bdfce665136bef3da6593450 (diff)
- (djm) [log.c] Fix dumb syntax error; ok dtucker@
(pulled from 4.0 branch).
-rw-r--r--ChangeLog3
-rw-r--r--log.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 138e3240b..598977e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
10 OpenSSH 4.0 10 OpenSSH 4.0
11 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 11 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
12 [contrib/suse/openssh.spec] Update spec file versions 12 [contrib/suse/openssh.spec] Update spec file versions
13 - (djm) [log.c] Fix dumb syntax error; ok dtucker@
13 - (djm) Release OpenSSH 4.0p1 14 - (djm) Release OpenSSH 4.0p1
14 15
1520050307 1620050307
@@ -2320,4 +2321,4 @@
2320 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2321 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2321 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2322 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2322 2323
2323$Id: ChangeLog,v 1.3707 2005/03/09 00:03:08 djm Exp $ 2324$Id: ChangeLog,v 1.3708 2005/03/09 09:12:47 dtucker Exp $
diff --git a/log.c b/log.c
index bb95c6c39..96ab24b04 100644
--- a/log.c
+++ b/log.c
@@ -193,11 +193,12 @@ debug3(const char *fmt,...)
193void 193void
194log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) 194log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
195{ 195{
196 argv0 = av0;
197#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) 196#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
198 struct syslog_data sdata = SYSLOG_DATA_INIT; 197 struct syslog_data sdata = SYSLOG_DATA_INIT;
199#endif 198#endif
200 199
200 argv0 = av0;
201
201 switch (level) { 202 switch (level) {
202 case SYSLOG_LEVEL_QUIET: 203 case SYSLOG_LEVEL_QUIET:
203 case SYSLOG_LEVEL_FATAL: 204 case SYSLOG_LEVEL_FATAL: