diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-04-28 03:20:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-04-28 13:26:36 +1000 |
commit | 68d3a2a059183ebd83b15e54984ffaced04d2742 (patch) | |
tree | 9d1cf14d357079cb09f338f8d7efb6737da356d3 /ssh.c | |
parent | e13aad66e73a14b062d13aee4e98f1e21a3f6a14 (diff) |
upstream commit
Add SyslogFacility option to ssh(1) matching the
equivalent option in sshd(8). bz#2705, patch from erahn at arista.com, ok
djm@
Upstream-ID: d5115c2c0193ceb056ed857813b2a7222abda9ed
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.451 2017/03/10 04:07:20 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.452 2017/04/28 03:20:27 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1007,8 +1007,11 @@ main(int ac, char **av) | |||
1007 | if (logfile != NULL) | 1007 | if (logfile != NULL) |
1008 | log_redirect_stderr_to(logfile); | 1008 | log_redirect_stderr_to(logfile); |
1009 | log_init(argv0, | 1009 | log_init(argv0, |
1010 | options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, | 1010 | options.log_level == SYSLOG_LEVEL_NOT_SET ? |
1011 | SYSLOG_FACILITY_USER, !use_syslog); | 1011 | SYSLOG_LEVEL_INFO : options.log_level, |
1012 | options.log_facility == SYSLOG_FACILITY_NOT_SET ? | ||
1013 | SYSLOG_FACILITY_USER : options.log_facility, | ||
1014 | !use_syslog); | ||
1012 | 1015 | ||
1013 | if (debug_flag) | 1016 | if (debug_flag) |
1014 | logit("%s, %s", SSH_RELEASE, | 1017 | logit("%s, %s", SSH_RELEASE, |
@@ -1150,7 +1153,7 @@ main(int ac, char **av) | |||
1150 | #endif | 1153 | #endif |
1151 | 1154 | ||
1152 | /* reinit */ | 1155 | /* reinit */ |
1153 | log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog); | 1156 | log_init(argv0, options.log_level, options.log_facility, !use_syslog); |
1154 | 1157 | ||
1155 | if (options.request_tty == REQUEST_TTY_YES || | 1158 | if (options.request_tty == REQUEST_TTY_YES || |
1156 | options.request_tty == REQUEST_TTY_FORCE) | 1159 | options.request_tty == REQUEST_TTY_FORCE) |