Skip to content

Commit

Permalink
Fix crash when debugging output is enabled
Browse files Browse the repository at this point in the history
Fixes #826: Enabling debugging output crashes Director
  • Loading branch information
MedicMomcilo authored and joergsteffens committed Aug 7, 2017
1 parent 38d0aec commit 674a529
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -105,6 +105,7 @@ Michael -buk- Scherer
Michael Renner
Michael Stapelberg
Michel Meyers
Momcilo Medic
Morgan
Nic Bellamy
Nicolas Boichat
Expand Down
8 changes: 4 additions & 4 deletions src/dird/job.c
Expand Up @@ -1239,10 +1239,10 @@ void apply_pool_overrides(JCR *jcr, bool force)
pool_override = true;
if (jcr->res.run_inc_pool_override) {
pm_strcpy(jcr->res.pool_source, _("Run IncPool override"));
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.full_pool->name(), "Run IncPool override\n");
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.inc_pool->name(), "Run IncPool override\n");
} else {
pm_strcpy(jcr->res.pool_source, _("Job IncPool override"));
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.full_pool->name(), "Job IncPool override\n");
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.inc_pool->name(), "Job IncPool override\n");
}
}
break;
Expand All @@ -1252,10 +1252,10 @@ void apply_pool_overrides(JCR *jcr, bool force)
pool_override = true;
if (jcr->res.run_diff_pool_override) {
pm_strcpy(jcr->res.pool_source, _("Run DiffPool override"));
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.full_pool->name(), "Run DiffPool override\n");
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.diff_pool->name(), "Run DiffPool override\n");
} else {
pm_strcpy(jcr->res.pool_source, _("Job DiffPool override"));
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.full_pool->name(), "Job DiffPool override\n");
Dmsg2(100, "Pool set to '%s' because of %s", jcr->res.diff_pool->name(), "Job DiffPool override\n");
}
}
break;
Expand Down

0 comments on commit 674a529

Please sign in to comment.