Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-04-25 10:02:46 +00:00
24 changed files with 235 additions and 353 deletions

View File

@ -258,6 +258,9 @@ client_main(int argc, char **argv, int flags)
return (1);
}
/* Establish signal handlers. */
set_signals(client_signal);
/* Initialize the client socket and start the server. */
fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER);
if (fd == -1) {
@ -305,9 +308,6 @@ client_main(int argc, char **argv, int flags)
tcsetattr(STDIN_FILENO, TCSANOW, &tio);
}
/* Establish signal handlers. */
set_signals(client_signal);
/* Send identify messages. */
client_send_identify(flags);