search for: nonfatal_fatal

...ytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2); @@ -665,17 +669,14 @@ } } -void -fatal(const char *fmt,...) +extern int fatal_cleanup_called; +static void +fatal_callback(void *arg) { - va_list args; - va_start(args, fmt); - do_log(SYSLOG_LEVEL_FATAL, fmt, args); - va_end(args); - if (nonfatal_fatal) + if (nonfatal_fatal) { + fatal_cleanup_called = 0; longjmp(kexjmp, -1); - else - fatal_cleanup(); + } } static void @@ -777,6 +778,7 @@ usage(); log_init("ssh-keyscan", log_level, SYSLOG_FACILITY_USER, 1); + fatal_add_cleanup(fatal_callback, NULL); maxfd = fdlim_get(...

...+ +#define KT_RSA1 1 +#define KT_DSA 2 +#define KT_RSA 4 +int get_keytypes = KT_RSA1; /* Get only RSA1 keys by default */ + #define MAXMAXFD 256 /* The number of seconds after which to give up on a TCP connection */ @@ -39,6 +57,8 @@ fd_set *read_wait; size_t read_wait_size; int ncon; +int nonfatal_fatal = 0; +jmp_buf kexjmp; /* * Keep a connection structure for each file descriptor. The state @@ -54,11 +74,13 @@ int c_plen; /* Packet length field for ssh packet */ int c_len; /* Total bytes which must be read. */ int c_off; /* Length of data read so far. */ + int c_keytype; /* Only...

Hi, I am using ssh-keyscan with a list of hosts, such as: ssh-keyscan -t rsa -f hosts_for_keyscan Some of the hosts in the list have dsa, but no rsa keys. For such hosts, the command displays: no hostkey alg When this is the case for 2 hosts, this message appears twice AND SSH-KEYSCAN STOPS QUERYING, which means that no keys at all are returned for the following hosts. Here is the part of the

...if (i < 0) + i = s; c = TAILQ_NEXT(c, c_link); - conrecycle(s); } + connclosed = 0; } static void @@ -583,6 +712,19 @@ } } +/* + * Convert general remote aborts to continues while the `dispatch_run()' + * function is being executed. + */ +void +cleanup_exit(int i) +{ + if (nonfatal_fatal) + longjmp(kexjmp, -1); + else + exit(i); +} + void fatal(const char *fmt,...) { @@ -601,7 +743,7 @@ usage(void) { fprintf(stderr, - "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n" + "usage: %s [-46HLv] [-f file] [-p port] [-T timeout] [-t type]\n&qu...