From 5bb53d8b84a0fccd25c11beac59034ebcf61920d Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 3 Dec 2006 15:48:18 +0000
Subject: [PATCH] kes  Turn off data encryption. It can be enabled by defining 
     DATA_ENCRYPTION in src/version.h and recompiling. kes  Implement flag to
 turn off data encryption feature.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3736 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/filed/filed_conf.c | 39 +++++++++++++++++++----------------
 bacula/src/version.h          |  4 +++-
 bacula/technotes-1.39         |  3 +++
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c
index 5812c904b1..0bcb3129ce 100644
--- a/bacula/src/filed/filed_conf.c
+++ b/bacula/src/filed/filed_conf.c
@@ -101,11 +101,13 @@ static RES_ITEM cli_items[] = {
    {"heartbeatinterval", store_time, ITEM(res_client.heartbeat_interval), 0, ITEM_DEFAULT, 0},
    {"sdconnecttimeout", store_time,ITEM(res_client.SDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
    {"maximumnetworkbuffersize", store_pint, ITEM(res_client.max_network_buffer_size), 0, 0, 0},
+#ifdef DATA_ENCRYPTION
    {"pkisignatures",         store_bool,    ITEM(res_client.pki_sign), 0, ITEM_DEFAULT, 0},
    {"pkiencryption",         store_bool,    ITEM(res_client.pki_encrypt), 0, ITEM_DEFAULT, 0},
    {"pkikeypair",            store_dir,       ITEM(res_client.pki_keypair_file), 0, 0, 0},
    {"pkisigner",             store_alist_str, ITEM(res_client.pki_signing_key_files), 0, 0, 0},
    {"pkimasterkey",          store_alist_str, ITEM(res_client.pki_master_key_files), 0, 0, 0},
+#endif
    {"tlsenable",             store_bool,    ITEM(res_client.tls_enable),  0, 0, 0},
    {"tlsrequire",            store_bool,    ITEM(res_client.tls_require), 0, 0, 0},
    {"tlscacertificatefile",  store_dir,       ITEM(res_client.tls_ca_certfile), 0, 0, 0},
@@ -165,26 +167,27 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
       recurse = 0;
    }
    switch (type) {
-      case R_DIRECTOR:
-         sendit(sock, "Director: name=%s password=%s\n", reshdr->name,
-                 res->res_dir.password);
-         break;
-      case R_CLIENT:
-         sendit(sock, "Client: name=%s FDport=%d\n", reshdr->name,
-                 get_first_port_host_order(res->res_client.FDaddrs));
-         break;
-      case R_MSGS:
-         sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
-         if (res->res_msgs.mail_cmd)
-            sendit(sock, "      mailcmd=%s\n", res->res_msgs.mail_cmd);
-         if (res->res_msgs.operator_cmd)
-            sendit(sock, "      opcmd=%s\n", res->res_msgs.operator_cmd);
-         break;
-      default:
-         sendit(sock, "Unknown resource type %d\n", type);
+   case R_DIRECTOR:
+      sendit(sock, "Director: name=%s password=%s\n", reshdr->name,
+              res->res_dir.password);
+      break;
+   case R_CLIENT:
+      sendit(sock, "Client: name=%s FDport=%d\n", reshdr->name,
+              get_first_port_host_order(res->res_client.FDaddrs));
+      break;
+   case R_MSGS:
+      sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
+      if (res->res_msgs.mail_cmd)
+         sendit(sock, "      mailcmd=%s\n", res->res_msgs.mail_cmd);
+      if (res->res_msgs.operator_cmd)
+         sendit(sock, "      opcmd=%s\n", res->res_msgs.operator_cmd);
+      break;
+   default:
+      sendit(sock, "Unknown resource type %d\n", type);
    }
-   if (recurse && res->res_dir.hdr.next)
+   if (recurse && res->res_dir.hdr.next) {
       dump_resource(type, res->res_dir.hdr.next, sendit, sock);
+   }
 }
 
 /*
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 5c25a18f12..362944af0b 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -49,11 +49,13 @@
 /* If this is set stdout will not be closed on startup */
 #define DEVELOPER 1
 
+/* #define DATA_ENCRYPTION 1 */
+
 #define USE_BSNPRINTF 1
 
 /* Debug flags not normally turned on */
 
-/* #define FILE_SEEK 1 */
+#define FILE_SEEK 1
 
 /* #define TRACE_JCR_CHAIN 1 */
 /* #define TRACE_RES 1 */
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 3389cd0e6a..731567919c 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -2,6 +2,9 @@
 
 General:
 03Dec06
+kes  Turn off data encryption. It can be enabled by defining
+     DATA_ENCRYPTION in src/version.h and recompiling.
+kes  Implement flag to turn off data encryption feature.
 kes  Move unserial code in restore.c to a subroutine. Add a bit of debug
      code.
 kes  Rework a bit of code in backup.c to handle sparse blocks correctly.
-- 
2.39.5