diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-09 00:35:42 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-09 00:35:42 +0000 |
commit | 48bd7c118a25b950842864c7eb87ef666cbc342d (patch) | |
tree | b678668f292f8a8bb5e00b9b8f89d86370a8e11f /channels.c | |
parent | 99a0563fd59e1d3e1b79a1a9dd38ce9f6b5059ee (diff) |
- (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/08 22:29:05
[auth2.c compat.c compat.h servconf.c servconf.h sshd.8
sshd_config version.h]
implement option 'Banner /etc/issue.net' for ssh2, move version to
2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner
is enabled).
- markus@cvs.openbsd.org 2001/01/08 22:03:23
[channels.c ssh-keyscan.c]
O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/08 21:55:41
[sshconnect1.c]
more cleanups and fixes from stevesk@pobox.com:
1) try_agent_authentication() for loop will overwrite key just
allocated with key_new(); don't alloc
2) call ssh_close_authentication_connection() before exit
try_agent_authentication()
3) free mem on bad passphrase in try_rsa_authentication()
- markus@cvs.openbsd.org 2001/01/08 21:48:17
[kex.c]
missing free; thanks stevesk@pobox.com
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.c b/channels.c index b1fcd7ca8..254f5df2f 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.79 2000/12/29 22:19:13 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.80 2001/01/08 22:03:23 markus Exp $"); |
44 | 44 | ||
45 | #include "ssh.h" | 45 | #include "ssh.h" |
46 | #include "packet.h" | 46 | #include "packet.h" |
@@ -1743,7 +1743,7 @@ channel_connect_to(const char *host, u_short host_port) | |||
1743 | error("socket: %.100s", strerror(errno)); | 1743 | error("socket: %.100s", strerror(errno)); |
1744 | continue; | 1744 | continue; |
1745 | } | 1745 | } |
1746 | if (fcntl(sock, F_SETFL, O_NDELAY) < 0) | 1746 | if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) |
1747 | fatal("connect_to: F_SETFL: %s", strerror(errno)); | 1747 | fatal("connect_to: F_SETFL: %s", strerror(errno)); |
1748 | /* Connect to the host/port. */ | 1748 | /* Connect to the host/port. */ |
1749 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && | 1749 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && |