lib/dird: remove uncompleted, not needed code

bareos · Oct 17, 2019 · 7b362ba · 7b362ba
1 parent 2b4664f
commit 7b362ba
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 282 deletions.
diff --git a/core/src/dird/CMakeLists.txt b/core/src/dird/CMakeLists.txt
@@ -24,7 +24,7 @@ set(DIRDSRCS dird.cc)
 set(DIRD_OBJECTS_SRCS admin.cc archive.cc authenticate.cc authenticate_console.cc
    autoprune.cc backup.cc bsr.cc catreq.cc
    consolidate.cc dird_globals.cc dir_plugins.cc dird_conf.cc expand.cc fd_cmds.cc
-   getmsg.cc inc_conf.cc job.cc jobq.cc migrate.cc mountreq.cc msgchan.cc
+   getmsg.cc inc_conf.cc job.cc jobq.cc migrate.cc msgchan.cc
    ndmp_dma_storage.cc
    ndmp_dma_backup_common.cc ndmp_dma_backup_NDMP_BAREOS.cc ndmp_dma_backup_NDMP_NATIVE.cc
    ndmp_dma_generic.cc

diff --git a/core/src/dird/getmsg.cc b/core/src/dird/getmsg.cc
@@ -45,7 +45,6 @@
 #include "include/bareos.h"
 #include "dird.h"
 #include "dird/catreq.h"
-#include "dird/mountreq.h"
 #include "dird/msgchan.h"
 #include "lib/bnet.h"
 #include "lib/edit.h"
@@ -267,11 +266,6 @@ int BgetDirmsg(BareosSocket* bs, bool allow_any_message)
       }
       continue;
     }
-    if (bs->msg[0] == 'M') { /* Mount request */
-      Dmsg1(900, "Mount req: %s", bs->msg);
-      MountRequest(jcr, bs, msg);
-      continue;
-    }
     if (bs->msg[0] == 'S') { /* Status change */
       int JobStatus;
       char Job[MAX_NAME_LENGTH];

diff --git a/core/src/dird/mountreq.cc b/core/src/dird/mountreq.cc
diff --git a/core/src/dird/mountreq.h b/core/src/dird/mountreq.h
diff --git a/core/src/lib/CMakeLists.txt b/core/src/lib/CMakeLists.txt
@@ -28,7 +28,7 @@ set(INCLUDE_FILES ../include/baconfig.h ../include/bareos.h
    guid_to_name.h htable.h ini.h lex.h lib.h lockmgr.h
    md5.h mem_pool.h message.h messages_resource.h messages_resource_items.h
    mntent_cache.h parse_conf.h
-   plugins.h qualified_resource_name_type_converter.h queue.h rblist.h
+   plugins.h qualified_resource_name_type_converter.h rblist.h
    runscript.h rwlock.h scsi_crypto.h scsi_lli.h scsi_tapealert.h
    serial.h sha1.h status.h thread_list.h tls.h tls_conf.h tree.h try_tls_handshake_as_a_server.h
    var.h watchdog.h)
@@ -56,7 +56,7 @@ set (BAREOS_SRCS  address_conf.cc alist.cc attr.cc attribs.cc backtrace.cc base6
    jcr.cc json.cc lockmgr.cc md5.cc mem_pool.cc message.cc messages_resource.cc
    mntent_cache.cc output_formatter.cc passphrase.cc path_list.cc plugins.cc
    bpoll.cc  priv.cc recent_job_results_list.cc
-   queue.cc rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc  scsi_lli.cc
+   rblist.cc runscript.cc rwlock.cc scan.cc scsi_crypto.cc  scsi_lli.cc
    serial.cc sha1.cc signal.cc thread_list.cc thread_specific_data.cc timer_thread.cc tls.cc
    tls_conf.cc tls_openssl.cc
    tls_openssl_crl.cc tls_openssl_private.cc tree.cc  try_tls_handshake_as_a_server.cc

diff --git a/core/src/lib/lib.h b/core/src/lib/lib.h
@@ -33,7 +33,6 @@
 #include "crypto.h"
 #include "mem_pool.h"
 #include "rwlock.h"
-#include "queue.h"
 #include "serial.h"
 #include "lex.h"
 #ifndef BAREOS_LIB_LIB_H_

diff --git a/core/src/lib/queue.cc b/core/src/lib/queue.cc
diff --git a/core/src/lib/queue.h b/core/src/lib/queue.h