From: Shengjing Zhu <zhsj@umcloud.com>
Date: Thu, 4 May 2017 07:52:04 +0000 (+0800)
Subject: common: fix building against libcryptopp
X-Git-Tag: v12.0.3~100^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f031800760e38ce85b19779791a3aebf87686860;p=ceph.git

common: fix building against libcryptopp

libnspr is only needed for libnss, move it to if defined(USE_NSS)
section.

ceph::crypto::shutdown's params should be same with declaration.

Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
---

diff --git a/src/common/ceph_crypto.cc b/src/common/ceph_crypto.cc
index e8e6bc670ee..67db503149b 100644
--- a/src/common/ceph_crypto.cc
+++ b/src/common/ceph_crypto.cc
@@ -18,7 +18,6 @@
 #include "ceph_crypto.h"
 #include "auth/Crypto.h"
 
-#include <nspr.h>
 #include <pthread.h>
 #include <stdlib.h>
 
@@ -28,7 +27,7 @@ void ceph::crypto::init(CephContext *cct)
 {
 }
 
-void ceph::crypto::shutdown()
+void ceph::crypto::shutdown(bool)
 {
 }
 
@@ -45,6 +44,7 @@ ceph::crypto::HMACSHA256::~HMACSHA256()
 
 // for SECMOD_RestartModules()
 #include <secmod.h>
+#include <nspr.h>
 
 static pthread_mutex_t crypto_init_mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint32_t crypto_refs = 0;