summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:23:20 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:23:20 +0000
commit5c3855210ef20be5931d4b58f641d71bc3b203e8 (patch)
treede100fe07cedd57448d9d4bd5bd23fa602c408b7 /sshconnect.c
parent836f0e9d9a847ad0510ff50b2bedc58e295e0913 (diff)
- deraadt@cvs.openbsd.org 2002/06/23 03:30:58
[scard.c ssh-dss.c ssh-rsa.c sshconnect.c sshconnect2.c sshd.c sshlogin.c sshpty.c] various KNF and %d for unsigned
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 9b4c38835..b89321fb8 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.125 2002/06/19 00:27:55 deraadt Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.126 2002/06/23 03:30:17 deraadt Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -266,7 +266,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
266 memset(&hints, 0, sizeof(hints)); 266 memset(&hints, 0, sizeof(hints));
267 hints.ai_family = family; 267 hints.ai_family = family;
268 hints.ai_socktype = SOCK_STREAM; 268 hints.ai_socktype = SOCK_STREAM;
269 snprintf(strport, sizeof strport, "%d", port); 269 snprintf(strport, sizeof strport, "%u", port);
270 if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0) 270 if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
271 fatal("%s: %.100s: %s", __progname, host, 271 fatal("%s: %.100s: %s", __progname, host,
272 gai_strerror(gaierr)); 272 gai_strerror(gaierr));
@@ -489,7 +489,6 @@ confirm(const char *prompt)
489 * check whether the supplied host key is valid, return -1 if the key 489 * check whether the supplied host key is valid, return -1 if the key
490 * is not valid. the user_hostfile will not be updated if 'readonly' is true. 490 * is not valid. the user_hostfile will not be updated if 'readonly' is true.
491 */ 491 */
492
493static int 492static int
494check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, 493check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
495 int readonly, const char *user_hostfile, const char *system_hostfile) 494 int readonly, const char *user_hostfile, const char *system_hostfile)