Merge pull request #7488 from ceph/wip-auth-hammer

hammer: auth: use libnss more safely

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc src/common/ceph_context.cc
Simple merge

diff --cc src/common/ceph_context.h
index 1fc26687c3c857f1361f78cb5de044b8992bc9a6,a77dfae6293e643f2e78e6d2ac255a11a3bdd26d..fd321c499a3b5f79096abd66d579c445f477599f
--- 1/src/common/ceph_context.h
--- 2/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@@ -183,11 -165,11 +181,11 @@@ private
    ceph::HeartbeatMap *_heartbeat_map;
  
    ceph_spinlock_t _associated_objs_lock;
 -  std::map<std::string, AssociatedSingletonObject*> _associated_objs;
 +  std::map<std::string, SingletonWrapper*> _associated_objs;
  
    // crypto
-   CryptoNone *_crypto_none;
-   CryptoAES *_crypto_aes;
+   CryptoHandler *_crypto_none;
+   CryptoHandler *_crypto_aes;
  
    // experimental
    CephContextObs *_cct_obs;