diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 09:58:15 +0000 |
| commit | a55fcaa060a8a5296437da631991116b28e265bd (patch) | |
| tree | 2957447454494c2046af5187ecd51e430756eba6 /crypto/openssh/sshconnect.c | |
| parent | 0a76acd42d2d8bc381424757c0a50f026a2c4324 (diff) | |
| download | FreeBSD-src-a55fcaa060a8a5296437da631991116b28e265bd.zip FreeBSD-src-a55fcaa060a8a5296437da631991116b28e265bd.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssh/sshconnect.c')
| -rw-r--r-- | crypto/openssh/sshconnect.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index 1ad91cf..eb8e1ed 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.72 2000/05/04 09:50:22 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.74 2000/05/17 16:57:02 markus Exp $"); #include <openssl/bn.h> #include <openssl/dsa.h> @@ -253,7 +253,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, temporarily_use_uid(original_real_uid); if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) { /* Successful connection. */ - memcpy(hostaddr, ai->ai_addr, sizeof(*hostaddr)); + memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); restore_uid(); break; } else { @@ -299,21 +299,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, return 1; } -char * -chop(char *s) -{ - char *t = s; - while (*t) { - if(*t == '\n' || *t == '\r') { - *t = '\0'; - return s; - } - t++; - } - return s; - -} - /* * Waits for the server identification string, and sends our own * identification string. |
