kes Set the default FD timeout to 3 minutes (previously 30).

kes  Apply Bastian Friedrich's weird spelling correction patch.

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

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index c357f2c56fb525249f587210841b806ac1e81a93..f7c0a27e64cd06319a10f160a7c76611cebb1557 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -120,8 +120,8 @@ static RES_ITEM dir_items[] = {
    {"subsysdirectory", store_dir,  ITEM(res_dir.subsys_directory), 0, 0, 0},
    {"maximumconcurrentjobs", store_pint32, ITEM(res_dir.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1},
    {"password",    store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
-   {"fdconnecttimeout", store_time,ITEM(res_dir.FDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
-   {"sdconnecttimeout", store_time,ITEM(res_dir.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
+   {"fdconnecttimeout", store_time,ITEM(res_dir.FDConnectTimeout), 0, ITEM_DEFAULT, 3 * 60},
+   {"sdconnecttimeout", store_time,ITEM(res_dir.SDConnectTimeout), 0, ITEM_DEFAULT, 30 * 60},
    {"heartbeatinterval", store_time, ITEM(res_dir.heartbeat_interval), 0, ITEM_DEFAULT, 0},
    {"tlsauthenticate",      store_bool,      ITEM(res_dir.tls_authenticate), 0, 0, 0},
    {"tlsenable",            store_bool,      ITEM(res_dir.tls_enable), 0, 0, 0},

diff --git a/bacula/src/filed/restore.c b/bacula/src/filed/restore.c
index d241d83caa8f1add01f746b41a6322e23cacf8ee..4d0a541dc447c2e8a369033c2f1fbcbbc81ddb98 100644 (file)
--- a/bacula/src/filed/restore.c
+++ b/bacula/src/filed/restore.c
@@ -657,9 +657,9 @@ void do_restore(JCR *jcr)
          break;
 
       default:
-         /* If extracting, wierd stream (not 1 or 2), close output file anyway */
+         /* If extracting, weird stream (not 1 or 2), close output file anyway */
          if (extract) {
-            Dmsg1(130, "Found wierd stream %d\n", rctx.stream);
+            Dmsg1(130, "Found weird stream %d\n", rctx.stream);
             if (rctx.size > 0 && !is_bopen(&rctx.bfd)) {
                Jmsg0(jcr, M_ERROR, 0, _("Logic error: output file should be open\n"));
             }

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index 72257d2624a7818389b5facf0be94704cfc5b772..c3a86d15805686eb5b2f83a68173531664981c1a 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -482,7 +482,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
       break;
 
    default:
-      /* If extracting, wierd stream (not 1 or 2), close output file anyway */
+      /* If extracting, weird stream (not 1 or 2), close output file anyway */
       if (extract) {
          if (!is_bopen(&bfd)) {
             Emsg0(M_ERROR, 0, _("Logic error output file should be open but is not.\n"));

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 4de45456d3417989e45daa43b474c0b83fc663c1..9cef8eac56445e9227ba26f97a11f879b65d9760 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -61,6 +61,9 @@ plugin
 remove reader/writer in FOPTS????
 
 General:
+11Sep08
+kes  Set the default FD timeout to 3 minutes (previously 30).
+kes  Apply Bastian Friedrich's weird spelling correction patch.
 10Sep08
 kes  Always print Verify hash differences. Rename variable to make the
      code slightly more readable.