diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 07:24:46 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 07:24:46 +0000 |
commit | 8a432f5fe0b6a5e140ef2d72adc23b851d8d2e53 (patch) | |
tree | b7c94ae56aadbc7807145865363acb44ec0eb761 /ssh.c | |
parent | 46d6e0909951021c3b16bf8ccf1778c01d370c4b (diff) |
- markus@cvs.openbsd.org 2001/03/03 23:59:34
[log.c ssh.c]
log*.c -> log.c
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.100 2001/03/01 22:46:37 markus Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.101 2001/03/03 23:59:34 markus Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -556,9 +556,11 @@ main(int ac, char **av) | |||
556 | /* Take a copy of the returned structure. */ | 556 | /* Take a copy of the returned structure. */ |
557 | pw = pwcopy(pw); | 557 | pw = pwcopy(pw); |
558 | 558 | ||
559 | /* Initialize "log" output. Since we are the client all output | 559 | /* |
560 | actually goes to the terminal. */ | 560 | * Initialize "log" output. Since we are the client all output |
561 | log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0); | 561 | * actually goes to stderr. |
562 | */ | ||
563 | log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); | ||
562 | 564 | ||
563 | /* Read per-user configuration file. */ | 565 | /* Read per-user configuration file. */ |
564 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); | 566 | snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); |
@@ -571,7 +573,7 @@ main(int ac, char **av) | |||
571 | fill_default_options(&options); | 573 | fill_default_options(&options); |
572 | 574 | ||
573 | /* reinit */ | 575 | /* reinit */ |
574 | log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0); | 576 | log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 1); |
575 | 577 | ||
576 | if (options.user == NULL) | 578 | if (options.user == NULL) |
577 | options.user = xstrdup(pw->pw_name); | 579 | options.user = xstrdup(pw->pw_name); |