diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-06 15:18:16 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-06 15:18:16 +0000 |
commit | d26dcf3371657e64dddc7c86c61a89666d4e7053 (patch) | |
tree | 34c3c8ce1bacad2b8a5d5999c0461bcba4abfa5c /session.c | |
parent | 8835a8910513621a4c20a0ede9a4bdeee947cbd4 (diff) |
20010107
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/06 11:23:27
[ssh-rsa.c]
remove unused
- itojun@cvs.openbsd.org 2001/01/05 08:23:29
[ssh-keyscan.1]
missing .El
- markus@cvs.openbsd.org 2001/01/04 22:41:03
[session.c sshconnect.c]
consistent use of _PATH_BSHELL; from stevesk@pobox.com
- djm@cvs.openbsd.org 2001/01/04 22:35:32
[ssh.1 sshd.8]
Mention AES as available SSH2 Cipher; ok markus
- markus@cvs.openbsd.org 2001/01/04 22:25:58
[sshd.c]
sync usage()/man with defaults; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/04 22:21:26
[sshconnect2.c]
handle SSH2_MSG_USERAUTH_BANNER; fixes bug when connecting to a server
that prints a banner (e.g. /etc/issue.net)
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.45 2000/12/19 23:17:58 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.46 2001/01/04 22:41:03 markus Exp $"); |
37 | 37 | ||
38 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |
39 | #include "ssh.h" | 39 | #include "ssh.h" |
@@ -1336,7 +1336,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1336 | if (!options.use_login) { | 1336 | if (!options.use_login) { |
1337 | if (stat(SSH_USER_RC, &st) >= 0) { | 1337 | if (stat(SSH_USER_RC, &st) >= 0) { |
1338 | if (debug_flag) | 1338 | if (debug_flag) |
1339 | fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_USER_RC); | 1339 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_USER_RC); |
1340 | 1340 | ||
1341 | f = popen(_PATH_BSHELL " " SSH_USER_RC, "w"); | 1341 | f = popen(_PATH_BSHELL " " SSH_USER_RC, "w"); |
1342 | if (f) { | 1342 | if (f) { |
@@ -1347,7 +1347,7 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1347 | fprintf(stderr, "Could not run %s\n", SSH_USER_RC); | 1347 | fprintf(stderr, "Could not run %s\n", SSH_USER_RC); |
1348 | } else if (stat(SSH_SYSTEM_RC, &st) >= 0) { | 1348 | } else if (stat(SSH_SYSTEM_RC, &st) >= 0) { |
1349 | if (debug_flag) | 1349 | if (debug_flag) |
1350 | fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_SYSTEM_RC); | 1350 | fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_SYSTEM_RC); |
1351 | 1351 | ||
1352 | f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w"); | 1352 | f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w"); |
1353 | if (f) { | 1353 | if (f) { |