From 8ca76656b65e55ae90604d92d8469aca5b6655db Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 22 Oct 2005 15:05:35 +0000 Subject: [PATCH] Print error message if no Changer Command found. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2474 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kernstodo | 5 +++++ bacula/kes-1.37 | 1 + bacula/src/stored/autochanger.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/bacula/kernstodo b/bacula/kernstodo index bf65169a89..b225365d17 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -50,11 +50,16 @@ Document: - Does WildFile match against full name? Doc. For 1.39: +<<<<<<< kernstodo +- Add binary tree search for tree routines. +- Eliminate use of column positions in wx-console. +======= - Add a new Autochanger directive "Global lock = yes|no" that provides a global lock on calling mtx-changer so that multiple autochanger definitions can reference the same physical autochanger. - Look at -D_FORTIFY_SOURCE=2 +>>>>>>> 1.576 - Close STDOUT if debug_level == 0 - Add recycle event. - Add scratch pool event. diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index 3245aac82c..010f5dc939 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -5,6 +5,7 @@ General: Changes to 1.37.41: 22Oct05 +- Print error message if no Changer Command found. - Apply fix from Martin Simmons to clear structure before using it in IPADDR -- fixes a bind() bug on AIX. 14Oct05 diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c index a87840e1e0..a1e49d1805 100644 --- a/bacula/src/stored/autochanger.c +++ b/bacula/src/stored/autochanger.c @@ -148,6 +148,11 @@ int get_autochanger_loaded_slot(DCR *dcr) uint32_t timeout = dcr->device->max_changer_wait; int drive = dcr->dev->drive_index; + if (!dcr->device->changer_command) { + Jmsg(jcr, M_FATAL, 0, _("3992 Missing Changer command.\n")); + return -1; + } + results = get_pool_memory(PM_MESSAGE); changer = get_pool_memory(PM_FNAME); -- 2.39.5