git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5601
91ce42f0-d328-0410-95d8-
f526ca767f89
}
/* Send restore command */
}
/* Send restore command */
- char replace, *where, *cmd=NULL;
+ char replace, *where, *cmd;
char empty = '\0';
if (jcr->replace != 0) {
char empty = '\0';
if (jcr->replace != 0) {
replace = REPLACE_ALWAYS; /* always replace */
}
replace = REPLACE_ALWAYS; /* always replace */
}
- where = ∅ /* default */
-
if (jcr->RegexWhere) {
where = jcr->RegexWhere; /* override */
cmd = restorecmdR;
} else if (jcr->job->RegexWhere) {
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) {
cmd = restorecmdR;
} else if (jcr->where) {
} else if (jcr->job->RestoreWhere) {
where = jcr->job->RestoreWhere; /* no override take from job */
cmd = restorecmd;
} else if (jcr->job->RestoreWhere) {
where = jcr->job->RestoreWhere; /* no override take from job */
cmd = restorecmd;
+
+ } else { /* nothing was specified */
+ where = ∅ /* use default */
+ cmd = restorecmd;
+ }
jcr->prefix_links = jcr->job->PrefixLinks;
jcr->prefix_links = jcr->job->PrefixLinks;
Technical notes on version 2.3
General:
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.
17Sep07
ebl Add an option to operate on all pools with update vol parameters.
This complete the project 20. Patch from Nigel Stepp.