2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 82d5c20ca..487cbe04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20090621
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2009/03/17 21:37:00
+     [ssh.c]
+     pass correct argv[0] to openlog(); ok djm@
+
 20090616
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
    is a struct with a __val member.  Fixes build on, eg, Redhat 6.2.
diff --git a/ssh.c b/ssh.c
index 9d43bb74f..96134680d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.324 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.325 2009/03/17 21:37:00 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -204,7 +204,7 @@ int
 main(int ac, char **av)
 {
         int i, opt, exit_status, use_syslog;
-        char *p, *cp, *line, buf[256];
+        char *p, *cp, *line, *argv0, buf[256];
         struct stat st;
         struct passwd *pw;
         int dummy, timeout_ms;
@@ -270,6 +270,7 @@ main(int ac, char **av)
         /* Parse command-line arguments. */
         host = NULL;
         use_syslog = 0;
+        argv0 = av[0];
 
  again:
         while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
@@ -600,7 +601,7 @@ main(int ac, char **av)
          * Initialize "log" output.  Since we are the client all output
          * actually goes to stderr.
          */
-        log_init(av[0],
+        log_init(argv0,
             options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
             SYSLOG_FACILITY_USER, !use_syslog);
 
@@ -628,7 +629,7 @@ main(int ac, char **av)
         channel_set_af(options.address_family);
 
         /* reinit */
-        log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
+        log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
 
         seed_rng();