diff options
| author | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
| commit | 72a8e501f778fe56e3ec3c32d99f77e20b9b24be (patch) | |
| tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/sshconnect.c | |
| parent | 96f831106bfe6170a73a8112d39a8b123156c6f2 (diff) | |
| download | FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.zip FreeBSD-src-72a8e501f778fe56e3ec3c32d99f77e20b9b24be.tar.gz | |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'crypto/openssh/sshconnect.c')
| -rw-r--r-- | crypto/openssh/sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index 9b4c388..d96b02d 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -13,7 +13,8 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.125 2002/06/19 00:27:55 deraadt Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.126 2002/06/23 03:30:17 deraadt Exp $"); +RCSID("$FreeBSD$"); #include <openssl/bn.h> @@ -266,7 +267,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, memset(&hints, 0, sizeof(hints)); hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; - snprintf(strport, sizeof strport, "%d", port); + snprintf(strport, sizeof strport, "%u", port); if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) fatal("%s: %.100s: %s", __progname, host, gai_strerror(gaierr)); @@ -489,7 +490,6 @@ confirm(const char *prompt) * check whether the supplied host key is valid, return -1 if the key * is not valid. the user_hostfile will not be updated if 'readonly' is true. */ - static int check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, int readonly, const char *user_hostfile, const char *system_hostfile) |
