diff options
| author | Roald J. van Loon <roaldvanloon@gmail.com> | 2013-08-27 08:17:19 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-27 08:17:19 -0700 |
| commit | 228510ff17178673b9ecf9341cc93f9c8c5df5ff (patch) | |
| tree | da72adf24da6b3a8654eaabad55b53c45012f8ee | |
| parent | a6fe776c3a04ddbc015ca104fa67ea8248bd0df9 (diff) | |
| download | ceph-228510ff17178673b9ecf9341cc93f9c8c5df5ff.tar.gz | |
cleanup: removed last references to g_conf from auth
Trivial cleanup. There were still 3 references to g_conf in CephxKeyServer.
Replaced them in favor of cct->_conf.
Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
| -rw-r--r-- | src/auth/cephx/CephxKeyServer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index e0c8174a2a1..e57b5575142 100644 --- a/src/auth/cephx/CephxKeyServer.cc +++ b/src/auth/cephx/CephxKeyServer.cc @@ -163,7 +163,7 @@ bool KeyServer::_check_rotating_secrets() ldout(cct, 10) << __func__ << " added " << added << dendl; data.rotating_ver++; //data.next_rotating_time = ceph_clock_now(cct); - //data.next_rotating_time += MIN(g_conf->auth_mon_ticket_ttl, g_conf->auth_service_ticket_ttl); + //data.next_rotating_time += MIN(cct->_conf->auth_mon_ticket_ttl, cct->_conf->auth_service_ticket_ttl); _dump_rotating_secrets(); return true; } @@ -191,7 +191,7 @@ int KeyServer::_rotate_secret(uint32_t service_id) RotatingSecrets& r = data.rotating_secrets[service_id]; int added = 0; utime_t now = ceph_clock_now(cct); - double ttl = service_id == CEPH_ENTITY_TYPE_AUTH ? g_conf->auth_mon_ticket_ttl : g_conf->auth_service_ticket_ttl; + double ttl = service_id == CEPH_ENTITY_TYPE_AUTH ? cct->_conf->auth_mon_ticket_ttl : cct->_conf->auth_service_ticket_ttl; while (r.need_new_secrets(now)) { ExpiringCryptoKey ek; @@ -424,7 +424,7 @@ int KeyServer::_build_session_auth_info(uint32_t service_id, CephXServiceTicketI { info.service_id = service_id; info.ticket = auth_ticket_info.ticket; - info.ticket.init_timestamps(ceph_clock_now(cct), g_conf->auth_service_ticket_ttl); + info.ticket.init_timestamps(ceph_clock_now(cct), cct->_conf->auth_service_ticket_ttl); generate_secret(info.session_key); |