From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 18 Nov 2004 14:35:31 +0000 (+0000)
Subject: Final changes
X-Git-Tag: Release-1.36.1~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d3ee62381348c8e7adffe17b3c371406e65490d;p=bacula%2Fbacula

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 dd6787c9ba..e2a309dd6b 100644
--- 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 5e63ba0288..31a4137c3d 100644
--- 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 bf8f0f4516..29c110c921 100644
--- 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 d6d8a4a25e..83f01037ea 100644
--- 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