=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- src/usr.bin/ssh/ssh.c 2009/02/12 03:00:56 1.324 +++ src/usr.bin/ssh/ssh.c 2009/03/17 21:37:00 1.325 @@ -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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -196,7 +196,7 @@ 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; @@ -257,6 +257,7 @@ /* 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" @@ -587,7 +588,7 @@ * 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); @@ -615,7 +616,7 @@ 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); if (options.user == NULL) options.user = xstrdup(pw->pw_name);