diff options
| author |   dtucker <dtucker@openbsd.org> | 2017-04-28 03:20:27 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2017-04-28 03:20:27 +0000 |
| commit | ce1fa632752ec951a775a9157933c77c9ae3e168 (patch) | |
| tree | 412feb604792f12bab47628b790920397be9b04c /usr.bin/ssh/ssh.c | |
| parent | ntohl() returns uint32_t so it cannot be < 0. Since we're storing (diff) | |
| download | wireguard-openbsd-ce1fa632752ec951a775a9157933c77c9ae3e168.tar.xz wireguard-openbsd-ce1fa632752ec951a775a9157933c77c9ae3e168.zip | |
Add SyslogFacility option to ssh(1) matching the equivalent option in
sshd(8). bz#2705, patch from erahn at arista.com, ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 771c2241e0a..3579b1f4cce 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.451 2017/03/10 04:07:20 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.452 2017/04/28 03:20:27 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -976,8 +976,11 @@ main(int ac, char **av) if (logfile != NULL) log_redirect_stderr_to(logfile); log_init(argv0, - options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, - SYSLOG_FACILITY_USER, !use_syslog); + options.log_level == SYSLOG_LEVEL_NOT_SET ? + SYSLOG_LEVEL_INFO : options.log_level, + options.log_facility == SYSLOG_FACILITY_NOT_SET ? + SYSLOG_FACILITY_USER : options.log_facility, + !use_syslog); if (debug_flag) logit("%s, %s", SSH_VERSION, @@ -1118,7 +1121,7 @@ main(int ac, char **av) options.use_privileged_port = 0; /* reinit */ - log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog); + log_init(argv0, options.log_level, options.log_facility, !use_syslog); if (options.request_tty == REQUEST_TTY_YES || options.request_tty == REQUEST_TTY_FORCE) |