From: Loic Dachary <loic@dachary.org>
Date: Wed, 24 Feb 2016 05:55:18 +0000 (+0700)
Subject: Merge pull request #7488 from ceph/wip-auth-hammer
X-Git-Tag: v0.94.7~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb84692e96569823e23fdd02356446577959f438;p=ceph.git

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

hammer: auth: use libnss more safely

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

bb84692e96569823e23fdd02356446577959f438
diff --cc src/common/ceph_context.h
index 1fc26687c3c8,a77dfae6293e..fd321c499a3b
--- a/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;