From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Mon, 26 Oct 2020 11:14:46 +0000 (+0100)
Subject: small fix for db_get_plugin_object_record
X-Git-Tag: Release-11.3.2~895
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89db48efe219446af340bdcbe04fd89b7e7f9899;p=thirdparty%2Fbacula.git

small fix for db_get_plugin_object_record
---

diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c
index 561bd8dbf..84aa54631 100644
--- a/bacula/src/cats/sql_get.c
+++ b/bacula/src/cats/sql_get.c
@@ -759,6 +759,8 @@ bool BDB::bdb_get_plugin_object_record(JCR *jcr, OBJECT_DBR *obj_r)
    if (obj_r->ObjectId > 0) {
       Mmsg(tmp, "WHERE ObjectId=%lu ", obj_r->ObjectId);
       pm_strcat(where_str, tmp.c_str());
+   } else {
+      return stat;
    }
 
    Mmsg(cmd,
@@ -770,10 +772,6 @@ bool BDB::bdb_get_plugin_object_record(JCR *jcr, OBJECT_DBR *obj_r)
 
    if (QueryDB(jcr, cmd)) {
       if (sql_num_rows() > 1) {
-         char ed1[30];
-         Mmsg1(errmsg, _("Error got %s PluginObjects but expected only one!\n"),
-            edit_uint64(sql_num_rows(), ed1));
-         sql_data_seek(sql_num_rows()-1);
          goto bail_out;
       }
       if ((row = sql_fetch_row()) == NULL) {
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 827b7c73c..1c9622d5e 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -1970,6 +1970,8 @@ static void do_object_delete(UAContext *ua, DBId_t ObjectId)
       goto bail_out;
    }
 
+   ua->send_msg(_("1000 Object deleted\n"));
+
    db_unlock(ua->db);
    return;