ssh-keyscan.c (181111) | ssh-keyscan.c (192595) |
---|---|
1/* $OpenBSD: ssh-keyscan.c,v 1.76 2008/04/30 10:14:03 djm Exp $ */ | 1/* $OpenBSD: ssh-keyscan.c,v 1.78 2009/01/22 10:02:34 djm Exp $ */ |
2/* 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 4 * 5 * Modification and redistribution in source and binary forms is 6 * permitted provided that due credit is given to the author and the 7 * OpenBSD project by leaving this copyright notice intact. 8 */ 9 --- 698 unchanged lines hidden (view full) --- 708 longjmp(kexjmp, -1); 709 else 710 exit(255); 711} 712 713static void 714usage(void) 715{ | 2/* 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 4 * 5 * Modification and redistribution in source and binary forms is 6 * permitted provided that due credit is given to the author and the 7 * OpenBSD project by leaving this copyright notice intact. 8 */ 9 --- 698 unchanged lines hidden (view full) --- 708 longjmp(kexjmp, -1); 709 else 710 exit(255); 711} 712 713static void 714usage(void) 715{ |
716 fprintf(stderr, "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n" 717 "\t\t [host | addrlist namelist] [...]\n", | 716 fprintf(stderr, 717 "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n" 718 "\t\t [host | addrlist namelist] ...\n", |
718 __progname); 719 exit(1); 720} 721 722int 723main(int argc, char **argv) 724{ 725 int debug_flag = 0, log_level = SYSLOG_LEVEL_INFO; --- 16 unchanged lines hidden (view full) --- 742 743 while ((opt = getopt(argc, argv, "Hv46p:T:t:f:")) != -1) { 744 switch (opt) { 745 case 'H': 746 hash_hosts = 1; 747 break; 748 case 'p': 749 ssh_port = a2port(optarg); | 719 __progname); 720 exit(1); 721} 722 723int 724main(int argc, char **argv) 725{ 726 int debug_flag = 0, log_level = SYSLOG_LEVEL_INFO; --- 16 unchanged lines hidden (view full) --- 743 744 while ((opt = getopt(argc, argv, "Hv46p:T:t:f:")) != -1) { 745 switch (opt) { 746 case 'H': 747 hash_hosts = 1; 748 break; 749 case 'p': 750 ssh_port = a2port(optarg); |
750 if (ssh_port == 0) { | 751 if (ssh_port <= 0) { |
751 fprintf(stderr, "Bad port '%s'\n", optarg); 752 exit(1); 753 } 754 break; 755 case 'T': 756 timeout = convtime(optarg); 757 if (timeout == -1 || timeout == 0) { 758 fprintf(stderr, "Bad timeout '%s'\n", optarg); --- 92 unchanged lines hidden --- | 752 fprintf(stderr, "Bad port '%s'\n", optarg); 753 exit(1); 754 } 755 break; 756 case 'T': 757 timeout = convtime(optarg); 758 if (timeout == -1 || timeout == 0) { 759 fprintf(stderr, "Bad timeout '%s'\n", optarg); --- 92 unchanged lines hidden --- |