From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 19 Nov 2016 14:16:56 +0000 (+0100)
Subject: Revert "Warn of Storage Daemon version incompatibility if label fails. Bug #2193"
X-Git-Tag: Release-7.4.5~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=55c1622ff9819d4144fbd66c3c8eeed04356baa7;p=bacula%2Fbacula

Revert "Warn of Storage Daemon version incompatibility if label fails. Bug #2193"

This reverts commit 10ecaa87061938356c8cb10f6f4afec1e2fc9260.
---

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index fb752c2968..e5cc16cb75 100644
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -707,15 +707,9 @@ static bool send_label_request(UAContext *ua, MEDIA_DBR *mr, MEDIA_DBR *omr,
 
    while (sd->recv() >= 0) {
       ua->send_msg("%s", sd->msg);
-      if (strstr((const POOLMEM *) sd->msg, "3000 OK label")) {
-         ok = false;
-         if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu VolABytes=%lld VolType=%d ",
-                   &VolBytes, &VolABytes, &VolType) == 3) {
-            ok = true;
-         }
-      }
-      if (!ok) {
-         ua->error_msg("Volume label failed: Storage Daemon and Director are incompatible versions.");
+      if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu VolABytes=%lld VolType=%d ",
+                 &VolBytes, &VolABytes, &VolType) == 3) {
+         ok = true;
       }
    }
    unbash_spaces(mr->VolumeName);