From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 23 Nov 2011 13:25:19 +0000 (+0100)
Subject: Fix compile problems with stored/status.c
X-Git-Tag: Release-7.0.0~434
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7bd602575cced17a401ae2e0791e0e55a35cd148;p=bacula%2Fbacula

Fix compile problems with stored/status.c
---

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 7c29ed6d06..505681d9fc 100644
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -369,12 +369,6 @@ static void send_device_status(DEVICE *dev, STATUS_PKT *sp)
               dev->num_reserved(), dev->blocked());
    sendit(msg, len, sp);
 
-   locked = dev->lock_holder;
-   if (locked) {
-      len = Mmsg(msg, _("Waiting for device locked by: %s\n"), locked);
-      sendit(msg, len, sp);
-   }
-
    len = Mmsg(msg, _("Device parameters:\n"));
    sendit(msg, len, sp);
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index d9f7e0a47a..5e77e56240 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -56,6 +56,13 @@
 /* If this is set stdout will not be closed on startup */
 /* #define DEVELOPER 1 */
 
+/* adjust DEVELOPER_MODE for status command */
+#ifdef DEVELOPER
+# define DEVELOPER_MODE 1
+#else
+# define DEVELOPER_MODE 0
+#endif
+
 /*
  * SMCHECK does orphaned buffer checking (memory leaks)
  *  it can always be turned on, but has some minor performance