From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 20 Sep 2007 07:15:31 +0000 (+0000)
Subject: ebl  Fix #955 bug which was introduce with regexwhere relocation.
X-Git-Tag: Release-3.0.0~2497
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9052e93bbb96b3b99b9a4c412ff4c9bf903c9096;p=bacula%2Fbacula

ebl  Fix #955 bug which was introduce with regexwhere relocation.


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

diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c
index 978f81476a..2c3b213bae 100644
--- a/bacula/src/dird/restore.c
+++ b/bacula/src/dird/restore.c
@@ -173,7 +173,7 @@ bool do_restore(JCR *jcr)
    }
 
    /* Send restore command */
-   char replace, *where, *cmd=NULL;
+   char replace, *where, *cmd;
    char empty = '\0';
 
    if (jcr->replace != 0) {
@@ -184,13 +184,11 @@ bool do_restore(JCR *jcr)
       replace = REPLACE_ALWAYS;       /* always replace */
    }
    
-   where = &empty;                    /* default */
-
    if (jcr->RegexWhere) {
       where = jcr->RegexWhere;             /* override */
       cmd = restorecmdR;
    } else if (jcr->job->RegexWhere) {
-      where = jcr->job->RegexWhere; /* no override take from job */
+      where = jcr->job->RegexWhere;   /* no override take from job */
       cmd = restorecmdR;
 
    } else if (jcr->where) {
@@ -199,7 +197,11 @@ bool do_restore(JCR *jcr)
    } else if (jcr->job->RestoreWhere) {
       where = jcr->job->RestoreWhere; /* no override take from job */
       cmd = restorecmd;
-   } 
+
+   } else {			      /* nothing was specified */
+      where = &empty;		      /* use default */
+      cmd   = restorecmd;		     
+   }
    
    jcr->prefix_links = jcr->job->PrefixLinks;
 
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 39d628241b..f193bec071 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,8 @@
               Technical notes on version 2.3
 
 General:
+20Sep07
+ebl  Fix #955 bug which was introduce with regexwhere relocation.
 17Sep07
 ebl  Add an option to operate on all pools with update vol parameters.
      This complete the project 20. Patch from Nigel Stepp.