Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-07-20 18:01:10 +01:00
6 changed files with 124 additions and 9 deletions

View File

@ -241,6 +241,7 @@ server_start(int lockfd, char *lockfile)
cfg_add_cause("%s: %s", cfg_file, cause);
}
cmdq_continue(cfg_cmd_q);
status_prompt_load_history();
server_add_accept(0);
@ -251,6 +252,7 @@ server_start(int lockfd, char *lockfile)
set_signals(server_signal_callback);
server_loop();
status_prompt_save_history();
exit(0);
}