From patchwork Tue Aug 27 09:20:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roald van Loon X-Patchwork-Id: 2850064 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 767D4BF546 for ; Tue, 27 Aug 2013 09:20:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3702C20122 for ; Tue, 27 Aug 2013 09:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AE762010B for ; Tue, 27 Aug 2013 09:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752939Ab3H0JUt (ORCPT ); Tue, 27 Aug 2013 05:20:49 -0400 Received: from mail-oa0-f47.google.com ([209.85.219.47]:64733 "EHLO mail-oa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752716Ab3H0JUt (ORCPT ); Tue, 27 Aug 2013 05:20:49 -0400 Received: by mail-oa0-f47.google.com with SMTP id g12so4948778oah.20 for ; Tue, 27 Aug 2013 02:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=ukMyv02sOnk2SYu+KPQH9p8L6Dac3a1/sZx9OELLiE4=; b=YcSwc/YF77+mBmYmJomIhSA8UoJ9DeuGtXgInG5f98xzrLitNHPA95dtQYRoIMXo9+ Pndh1daGIWe5OWBxOO1LxcBOrh7bOQpE3wnldGnds70lAFbR3RQesNQMgN4f30oDwNf+ f0Aw8hRBdO3FJkyHK6uHgSlAZQVwV1Gpbc91t17BdP+Xmxc6o7LuHxwYt0wnCSp6J3e9 57+zy9QV0dlu/PRrnFQ7ytSNmr1lICbss6glT7Ex46QCGWqJQxs9UoP+WLIHAHvVqbrN glc4qP5WyaUavYseGjKpDBemAUl/JRreNZdz7DhI9Rb0SedAqNmIRzz5atbblStzfwUq Q/yw== MIME-Version: 1.0 X-Received: by 10.60.16.104 with SMTP id f8mr39090oed.71.1377595248903; Tue, 27 Aug 2013 02:20:48 -0700 (PDT) Received: by 10.182.118.10 with HTTP; Tue, 27 Aug 2013 02:20:48 -0700 (PDT) Date: Tue, 27 Aug 2013 11:20:48 +0200 Message-ID: Subject: [PATCH] cleanup: removed last references to g_conf from auth From: Roald van Loon To: "ceph-devel@vger.kernel.org" Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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); -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index e0c8174..e57b557 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();