[Bacula-commits] bacula/src/filed filed.c,1.51.4.3,1.51.4.4

[Landon F. <la...@us...>]

Update of /cvsroot/bacula/bacula/src/filed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9520/src/filed

Modified Files:
      Tag: Branch-1_38-encryption
	filed.c 
Log Message:
- Move OpenSSL generic library support functions to src/lib/openssl.c
- Add PEM passphrase callback support to crypto_keypair_load_key()
- Add ASN.1 CryptoData syntax


Index: filed.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/filed/filed.c,v
retrieving revision 1.51.4.3
retrieving revision 1.51.4.4
diff -u -d -r1.51.4.3 -r1.51.4.4
--- filed.c	7 Nov 2005 03:30:50 -0000	1.51.4.3
+++ filed.c	30 Nov 2005 17:29:58 -0000	1.51.4.4
@@ -364,7 +364,7 @@
                OK = false;
             }
 
-            if (!crypto_keypair_load_key(me->pki_keypair, me->pki_keypairfile)) {
+            if (!crypto_keypair_load_key(me->pki_keypair, me->pki_keypairfile, NULL, NULL)) {
                Emsg2(M_FATAL, 0, _("Failed to load private key for File"
                      " daemon \"%s\" in %s.\n"), me->hdr.name, configfile);
                OK = false;