diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-17 22:34:22 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-17 22:34:22 +1000 |
commit | dcb6ecd1b3b25b6909296ff0546ca6b18d0c19d3 (patch) | |
tree | 7eb6d184356f6aa00e62c71565568db706f2e960 /sshconnect.c | |
parent | 0e65eed58acc0053d163e96463a7c4d0684e55bd (diff) |
- OpenBSD CVS update:
- markus@cvs.openbsd.org
[ssh.c]
fix usage()
[ssh2.h]
draft-ietf-secsh-architecture-05.txt
[ssh.1]
document ssh -T -N (ssh2 only)
[channels.c serverloop.c ssh.h sshconnect.c sshd.c aux.c]
enable nonblocking IO for sshd w/ proto 1, too; split out common code
[aux.c]
missing include
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sshconnect.c b/sshconnect.c index d74658c96..40e359ceb 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: sshconnect.c,v 1.72 2000/05/04 09:50:22 markus Exp $"); | 11 | RCSID("$OpenBSD: sshconnect.c,v 1.73 2000/05/17 08:20:15 markus Exp $"); |
12 | 12 | ||
13 | #include <openssl/bn.h> | 13 | #include <openssl/bn.h> |
14 | #include <openssl/dsa.h> | 14 | #include <openssl/dsa.h> |
@@ -301,21 +301,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
301 | return 1; | 301 | return 1; |
302 | } | 302 | } |
303 | 303 | ||
304 | char * | ||
305 | chop(char *s) | ||
306 | { | ||
307 | char *t = s; | ||
308 | while (*t) { | ||
309 | if(*t == '\n' || *t == '\r') { | ||
310 | *t = '\0'; | ||
311 | return s; | ||
312 | } | ||
313 | t++; | ||
314 | } | ||
315 | return s; | ||
316 | |||
317 | } | ||
318 | |||
319 | /* | 304 | /* |
320 | * Waits for the server identification string, and sends our own | 305 | * Waits for the server identification string, and sends our own |
321 | * identification string. | 306 | * identification string. |