In lsh's default exception handler, call exit on EXC_IO_CONNECT.

aa7ce0e2 · Magnus Holmgren · Niels Möller · b19782e4 · aa7ce0e2 · aa7ce0e2
Commit aa7ce0e2 authored Apr 19, 2013 by Magnus Holmgren Committed by Niels Möller Apr 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

ChangeLog ChangeLog +3 -0

src/lsh.c src/lsh.c +2 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 2013-04-19  Magnus Holmgren <holmgren@debian.org>

+	* src/lsh.c (do_lsh_default_handler): Call exit for
+	EXC_IO_CONNECT, to terminate properly on connection failure.
+
 	* src/io.c (io_bind_sockaddr): Set the IPV6_V6ONLY socket option
 	on AF_INET6 sockets.


--- a/src/lsh.c
+++ b/src/lsh.c
@@ -959,6 +959,8 @@ do_lsh_default_handler(struct exception_handler *s,
      *self->status = EXIT_FAILURE;
      
      werror("%z, (errno = %i)\n", e->msg, exc->error);
+      if (e->type == EXC_IO_CONNECT)
+	exit(*self->status);
    }
  else
    switch(e->type)