From: Landon Fuller <landonf@opendarwin.org>
Date: Sun, 15 Oct 2006 02:42:27 +0000 (+0000)
Subject: Fix a cosmetic bug that caused spurious OpenSSL error messages; there is no reason... 
X-Git-Tag: Release-2.0.0~356
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6b07b50cab6bf22b1f6224c7a6c7503a1ebf64f1;p=bacula%2Fbacula

Fix a cosmetic bug that caused spurious OpenSSL error messages; there is no reason to attempt to load a private key from master key files.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3561 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 3c4c90a9ec..2a2ccb9d97 100644
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -402,16 +402,6 @@ static int check_resources()
                } else {
                   if (crypto_keypair_load_cert(keypair, filepath)) {
                      me->pki_recipients->append(keypair);
-
-                     /* Attempt to load a private key, if available */
-                     if (crypto_keypair_has_key(filepath)) {
-                        if (!crypto_keypair_load_key(keypair, filepath, NULL, NULL)) {
-                           Emsg3(M_FATAL, 0, _("Failed to load private key from file %s for File"
-                              " daemon \"%s\" in %s.\n"), filepath, me->hdr.name, configfile);
-                           OK = false;
-                        }
-                     }
-
                   } else {
                      Emsg3(M_FATAL, 0, _("Failed to load master key certificate"
                         " from file %s for File daemon \"%s\" in %s.\n"), filepath, me->hdr.name, configfile);