[BACK]Return to ssh-keyscan.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keyscan.c between version 1.47.2.1 and 1.47.2.2

version 1.47.2.1, 2004/08/19 04:13:27 version 1.47.2.2, 2005/03/10 17:15:05
Line 29 
Line 29 
 #include "log.h"  #include "log.h"
 #include "atomicio.h"  #include "atomicio.h"
 #include "misc.h"  #include "misc.h"
   #include "hostfile.h"
   
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.  /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
    Default value is AF_UNSPEC means both IPv4 and IPv6. */     Default value is AF_UNSPEC means both IPv4 and IPv6. */
Line 42 
Line 43 
   
 int get_keytypes = KT_RSA1;     /* Get only RSA1 keys by default */  int get_keytypes = KT_RSA1;     /* Get only RSA1 keys by default */
   
   int hash_hosts = 0;             /* Hash hostname on output */
   
 #define MAXMAXFD 256  #define MAXMAXFD 256
   
 /* The number of seconds after which to give up on a TCP connection */  /* The number of seconds after which to give up on a TCP connection */
Line 357 
Line 360 
 static void  static void
 keyprint(con *c, Key *key)  keyprint(con *c, Key *key)
 {  {
           char *host = c->c_output_name ? c->c_output_name : c->c_name;
   
         if (!key)          if (!key)
                 return;                  return;
           if (hash_hosts && (host = host_hash(host, NULL, 0)) == NULL)
                   fatal("host_hash failed");
   
         fprintf(stdout, "%s ", c->c_output_name ? c->c_output_name : c->c_name);          fprintf(stdout, "%s ", host);
         key_write(key, stdout);          key_write(key, stdout);
         fputs("\n", stdout);          fputs("\n", stdout);
 }  }
Line 667 
Line 674 
 static void  static void
 usage(void)  usage(void)
 {  {
         fprintf(stderr, "usage: %s [-v46] [-p port] [-T timeout] [-t type] [-f file]\n"          fprintf(stderr, "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n"
             "\t\t   [host | addrlist namelist] [...]\n",              "\t\t   [host | addrlist namelist] [...]\n",
             __progname);              __progname);
         exit(1);          exit(1);
Line 688 
Line 695 
         if (argc <= 1)          if (argc <= 1)
                 usage();                  usage();
   
         while ((opt = getopt(argc, argv, "v46p:T:t:f:")) != -1) {          while ((opt = getopt(argc, argv, "Hv46p:T:t:f:")) != -1) {
                 switch (opt) {                  switch (opt) {
                   case 'H':
                           hash_hosts = 1;
                           break;
                 case 'p':                  case 'p':
                         ssh_port = a2port(optarg);                          ssh_port = a2port(optarg);
                         if (ssh_port == 0) {                          if (ssh_port == 0) {
Legend:
Removed from v.1.47.2.1  
changed lines
  Added in v.1.47.2.2