if (!director) {
Emsg2(M_FATAL, 0, _("Connection from unknown Director %s at %s rejected.\n"),
dirname, bs->who);
- goto bail_out;
+ free_pool_memory(dirname);
+ return 0;
}
+
+ /* Timeout Hello after 5 mins */
+ btimer_t *tid = start_bsock_timer(bs, 60 * 5);
if (!cram_md5_auth(bs, director->password, ssl_need) ||
!cram_md5_get_auth(bs, director->password, ssl_need)) {
+ stop_bsock_timer(tid);
Emsg0(M_FATAL, 0, _("Incorrect password given by Director.\n"));
- goto bail_out;
+ free_pool_memory(dirname);
+ return 0;
}
+ stop_bsock_timer(tid);
free_pool_memory(dirname);
return 1;
-
-bail_out:
- free_pool_memory(dirname);
- return 0;
}
/*
BSOCK *fd = jcr->file_bsock;
int ssl_need = BNET_SSL_NONE;
+ /* Timeout Hello after 5 mins */
+ btimer_t *tid = start_bsock_timer(fd, 60 * 5);
if (cram_md5_auth(fd, jcr->sd_auth_key, ssl_need) &&
cram_md5_get_auth(fd, jcr->sd_auth_key, ssl_need)) {
- jcr->authenticated = TRUE;
+ jcr->authenticated = true;
}
+ stop_bsock_timer(tid);
if (!jcr->authenticated) {
Jmsg(jcr, M_FATAL, 0, _("Incorrect authorization key from File daemon at %s rejected.\n"),
fd->who);