Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-05-27 16:01:22 +01:00
7 changed files with 206 additions and 269 deletions

View File

@ -486,6 +486,8 @@ server_second_callback(unused int fd, unused short events, unused void *arg)
server_client_status_timer();
format_clean();
evtimer_del(&server_ev_second);
memset(&tv, 0, sizeof tv);
tv.tv_sec = 1;