[Bacula-commits] [bacula.org] Bacula Community source branch Branch-5.2 updated. 78e58ff112266e983d099be37a6ec73dfd4e5a21

[<gi...@ba...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".

The branch, Branch-5.2 has been updated
       via  78e58ff112266e983d099be37a6ec73dfd4e5a21 (commit)
       via  c8bd70b8d23c60f10afa134e347e778450dd0c33 (commit)
      from  80d894c0c69f0d671cb237facb7184ea6b76115c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 78e58ff112266e983d099be37a6ec73dfd4e5a21
Author: Eric Bollengier <er...@ba...>
Date:   Thu Sep 13 08:49:44 2012 +0200

    Fix accurate option in the estimate command

commit c8bd70b8d23c60f10afa134e347e778450dd0c33
Author: Marco van Wieringen <mv...@pl...>
Date:   Thu Sep 13 07:43:32 2012 +0200

    Fix bug #1932 director crash.

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 603990e..d42bc7f 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1144,9 +1144,14 @@ static int estimate_cmd(UAContext *ua, const char *cmd)
          }
       }
       if (strcasecmp(ua->argk[i], NT_("accurate")) == 0) {
-         if (!is_yesno(ua->argv[i], &accurate)) {
-            ua->error_msg(_("Invalid value for accurate. " 
-                            "It must be yes or no.\n"));
+         if (ua->argv[i]) {
+            if (!is_yesno(ua->argv[i], &accurate)) {
+               ua->error_msg(_("Invalid value for accurate. " 
+                               "It must be yes or no.\n"));
+            }
+            continue;
+         } else {
+            ua->error_msg(_("Accurate value missing.\n"));
          }
       }
    }
diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index aecad99..fdee8f6 100644
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -53,7 +53,7 @@ static pthread_cond_t timer = PTHREAD_COND_INITIALIZER;
 int safer_unlink(const char *pathname, const char *regx)
 {
    int rc;
-   regex_t preg1, pexc1;
+   regex_t preg1;
    char prbuf[500];
    const int nmatch = 30;
    regmatch_t pmatch[nmatch];
@@ -83,7 +83,6 @@ int safer_unlink(const char *pathname, const char *regx)
       rtn = EROFS;
    }
    regfree(&preg1);
-   regfree(&pexc1);
    return rtn;
 }
 


hooks/post-receive
-- 
Bacula Community source