summaryrefslogtreecommitdiff
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-28 16:31:22 +1100
committerDamien Miller <djm@mindrot.org>2009-01-28 16:31:22 +1100
commit3dc71ad8653bab5591fc75bb1d3e6aa8fb9360df (patch)
treec41a8152c222b8bebb63d9d9185e8a160b71a5a0 /ssh-keyscan.c
parent9576ac4afc7124415183dd9fe73d410165dbfe82 (diff)
- djm@cvs.openbsd.org 2009/01/22 10:02:34
[clientloop.c misc.c readconf.c readconf.h servconf.c servconf.h] [serverloop.c ssh-keyscan.c ssh.c sshd.c] make a2port() return -1 when it encounters an invalid port number rather than 0, which it will now treat as valid (needed for future work) adjust current consumers of a2port() to check its return value is <= 0, which in turn required some things to be converted from u_short => int make use of int vs. u_short consistent in some other places too feedback & ok markus@
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index c6ec3507e..9a91be499 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.77 2008/11/01 11:14:36 sobrado Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.78 2009/01/22 10:02:34 djm Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -748,7 +748,7 @@ main(int argc, char **argv)
748 break; 748 break;
749 case 'p': 749 case 'p':
750 ssh_port = a2port(optarg); 750 ssh_port = a2port(optarg);
751 if (ssh_port == 0) { 751 if (ssh_port <= 0) {
752 fprintf(stderr, "Bad port '%s'\n", optarg); 752 fprintf(stderr, "Bad port '%s'\n", optarg);
753 exit(1); 753 exit(1);
754 } 754 }