Final changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1702 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/authenticate.c b/bacula/src/dird/authenticate.c
index dd6787c9ba4c7ffdab88629e398f0669058dc846..e2a309dd6bf6e56d5c39415433f3dd1587757d1b 100644 (file)
--- a/bacula/src/dird/authenticate.c
+++ b/bacula/src/dird/authenticate.c
@@ -64,7 +64,7 @@ bool authenticate_storage_daemon(JCR *jcr, STORE *store)
    bstrncpy(dirname, director->hdr.name, sizeof(dirname));
    bash_spaces(dirname);
    /* Timeout Hello after 1 min */
-   btimer_t *tid = start_bsock_timer(sd, 60);
+   btimer_t *tid = start_bsock_timer(sd, 60 * 10);
    if (!bnet_fsend(sd, hello, dirname)) {
       stop_bsock_timer(tid);
       Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to Storage daemon. ERR=%s\n"), bnet_strerror(sd));
@@ -107,8 +107,8 @@ int authenticate_file_daemon(JCR *jcr)
     */
    bstrncpy(dirname, director->hdr.name, sizeof(dirname));
    bash_spaces(dirname);
-   /* Timeout Hello after 5 mins */
-   btimer_t *tid = start_bsock_timer(fd, 60 * 5);
+   /* Timeout Hello after 10 mins */
+   btimer_t *tid = start_bsock_timer(fd, 60 * 10);
    if (!bnet_fsend(fd, hello, dirname)) {
       stop_bsock_timer(tid);
       Jmsg(jcr, M_FATAL, 0, _("Error sending Hello to File daemon. ERR=%s\n"), bnet_strerror(fd));

diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index 5e63ba028835c094bc723a7dec4aa3937cfddf84..31a4137c3d9e5d3601b546f75eee3d0bbf9b7f0a 100644 (file)
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -75,7 +75,7 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
       free_pool_memory(dirname);
       return 0;
    }
-   btimer_t *tid = start_bsock_timer(bs, 60 * 5);
+   btimer_t *tid = start_bsock_timer(bs, 60 * 10);
    if (!cram_md5_auth(bs, director->password, ssl_need) ||
        !cram_md5_get_auth(bs, director->password, ssl_need)) {
       Emsg1(M_FATAL, 0, _("Incorrect password given by Director at %s.\n"  
@@ -120,7 +120,7 @@ int authenticate_storagedaemon(JCR *jcr)
    int stat;
    int ssl_need = BNET_SSL_NONE;
 
-   btimer_t *tid = start_bsock_timer(sd, 60 * 5);
+   btimer_t *tid = start_bsock_timer(sd, 60 * 10);
    stat = cram_md5_get_auth(sd, jcr->sd_auth_key, ssl_need) &&
          cram_md5_auth(sd, jcr->sd_auth_key, ssl_need);
    stop_bsock_timer(tid);

diff --git a/bacula/src/stored/authenticate.c b/bacula/src/stored/authenticate.c
index bf8f0f45163e1a2b0fc9b214184940602d91160a..29c110c92133b240ae931281b80f5cba3e18c499 100644 (file)
--- a/bacula/src/stored/authenticate.c
+++ b/bacula/src/stored/authenticate.c
@@ -77,8 +77,8 @@ static int authenticate(int rcode, BSOCK *bs, JCR* jcr)
       return 0;
    }
 
-   /* Timeout Hello after 5 mins */
-   btimer_t *tid = start_bsock_timer(bs, 60 * 5);
+   /* Timeout Hello after 10 mins */
+   btimer_t *tid = start_bsock_timer(bs, 60 * 10);
    if (!cram_md5_auth(bs, director->password, ssl_need) ||
        !cram_md5_get_auth(bs, director->password, ssl_need)) {
       stop_bsock_timer(tid);
@@ -124,7 +124,7 @@ int authenticate_filed(JCR *jcr)
    int ssl_need = BNET_SSL_NONE;
 
    /* Timeout Hello after 5 mins */
-   btimer_t *tid = start_bsock_timer(fd, 60 * 5);
+   btimer_t *tid = start_bsock_timer(fd, 60 * 10);
    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;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index d6d8a4a25e7a8c1a6eb94021d6f7f9a9c395f394..83f01037ead387de778b1ee7ce2dcb938097c39e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
-#define VERSION "1.37.1"
-#define BDATE   "16 November 2004"
-#define LSMDATE "16Nov04"
+#define VERSION "1.36.1"
+#define BDATE   "18 November 2004"
+#define LSMDATE "18Nov04"
 
 /* Debug flags */
 #undef  DEBUG