Merge pull request #1297

python plugins: enable direct I/O in core instead of calling python for read and write
bareos · Dec 7, 2022 · 23d60b0 · 23d60b0
2 parents f037d72 + b39cdeb
commit 23d60b0
Show file tree

Hide file tree

Showing 51 changed files with 808 additions and 558 deletions.
diff --git a/cmake/BareosCheckAcl.cmake b/cmake/BareosCheckAcl.cmake
@@ -1,6 +1,6 @@
 # BAREOS® - Backup Archiving REcovery Open Sourced
 #
-# Copyright (C) 2020-2020 Bareos GmbH & Co. KG
+# Copyright (C) 2020-2022 Bareos GmbH & Co. KG
 #
 # This program is Free Software; you can redistribute it and/or modify it under
 # the terms of version three of the GNU Affero General Public License as
@@ -23,10 +23,10 @@ find_program(GETFACL_PROG getfacl)
 set(SETFACL_WORKS NO)
 if(SETFACL_PROG AND GETFACL_PROG)
   file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/acl-test-file.txt" "Just a testfile")
-  exec_program(
-    ${SETFACL_PROG} ${CMAKE_CURRENT_BINARY_DIR}
-    ARGS "-m user:0:rw- acl-test-file.txt"
-    RETURN_VALUE SETFACL_RETURN
+  execute_process(
+    COMMAND ${SETFACL_PROG} -m user:0:rw- acl-test-file.txt
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    RESULT_VARIABLE SETFACL_RETURN
   )
   if(SETFACL_RETURN EQUAL 0)
     set(SETFACL_WORKS YES)

diff --git a/core/src/filed/backup.cc b/core/src/filed/backup.cc
@@ -506,7 +506,7 @@ int SaveFile(JobControlRecord* jcr, FindFilesPacket* ff_pkt, bool)
   int rtnstat = 0;
   b_save_ctx bsctx;
   bool has_file_data = false;
-  struct save_pkt sp; /* use by option plugin */
+  save_pkt sp; /* use by option plugin */
   BareosSocket* sd = jcr->store_bsock;
 
   if (jcr->IsCanceled() || jcr->IsIncomplete()) { return 0; }

diff --git a/core/src/filed/crypto.cc b/core/src/filed/crypto.cc
@@ -271,7 +271,7 @@ bool VerifySignature(JobControlRecord* jcr, r_ctx& rctx)
  * Return value is true on success, false on failure.
  */
 bool FlushCipher(JobControlRecord* jcr,
-                 BareosWinFilePacket* bfd,
+                 BareosFilePacket* bfd,
                  uint64_t* addr,
                  char* flags,
                  int32_t stream,

diff --git a/core/src/filed/crypto.h b/core/src/filed/crypto.h
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2018-2021 Bareos GmbH & Co. KG
+   Copyright (C) 2018-2022 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -32,7 +32,7 @@ void CryptoSessionEnd(JobControlRecord* jcr);
 bool CryptoSessionSend(JobControlRecord* jcr, BareosSocket* sd);
 bool VerifySignature(JobControlRecord* jcr, r_ctx& rctx);
 bool FlushCipher(JobControlRecord* jcr,
-                 BareosWinFilePacket* bfd,
+                 BareosFilePacket* bfd,
                  uint64_t* addr,
                  char* flags,
                  int32_t stream,