diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 07:47:23 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 07:47:23 +0000 |
commit | 6df8ef4196f1287d4c328f09ea7f8c0995e0cab1 (patch) | |
tree | c4d4da3f9a84099838388a6070c7cdc675c27155 /ssh.c | |
parent | fafea18d68f3d1a4ea412ff4618fd66c1a05b548 (diff) |
- millert@cvs.openbsd.org 2001/03/04 17:42:28
[authfd.c channels.c dh.c log.c readconf.c servconf.c sftp-int.c
ssh.c sshconnect.c sshd.c]
log functions should not be passed strings that end in newline as they
get passed on to syslog() and when logging to stderr, do_log() appends
its own newline.
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: ssh.c,v 1.102 2001/03/04 10:57:53 stevesk Exp $"); | 42 | RCSID("$OpenBSD: ssh.c,v 1.103 2001/03/04 17:42:28 millert Exp $"); |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include <openssl/err.h> | 45 | #include <openssl/err.h> |
@@ -388,7 +388,7 @@ main(int ac, char **av) | |||
388 | options.log_level++; | 388 | options.log_level++; |
389 | break; | 389 | break; |
390 | } else { | 390 | } else { |
391 | fatal("Too high debugging level.\n"); | 391 | fatal("Too high debugging level."); |
392 | } | 392 | } |
393 | /* fallthrough */ | 393 | /* fallthrough */ |
394 | case 'V': | 394 | case 'V': |
@@ -544,14 +544,14 @@ main(int ac, char **av) | |||
544 | /* Do not allocate a tty if stdin is not a tty. */ | 544 | /* Do not allocate a tty if stdin is not a tty. */ |
545 | if (!isatty(fileno(stdin)) && !force_tty_flag) { | 545 | if (!isatty(fileno(stdin)) && !force_tty_flag) { |
546 | if (tty_flag) | 546 | if (tty_flag) |
547 | log("Pseudo-terminal will not be allocated because stdin is not a terminal.\n"); | 547 | log("Pseudo-terminal will not be allocated because stdin is not a terminal."); |
548 | tty_flag = 0; | 548 | tty_flag = 0; |
549 | } | 549 | } |
550 | 550 | ||
551 | /* Get user data. */ | 551 | /* Get user data. */ |
552 | pw = getpwuid(original_real_uid); | 552 | pw = getpwuid(original_real_uid); |
553 | if (!pw) { | 553 | if (!pw) { |
554 | log("You don't exist, go away!\n"); | 554 | log("You don't exist, go away!"); |
555 | exit(1); | 555 | exit(1); |
556 | } | 556 | } |
557 | /* Take a copy of the returned structure. */ | 557 | /* Take a copy of the returned structure. */ |