From patchwork Tue Aug 27 09:49:57 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: 2850100 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 9CE0FBF546 for ; Tue, 27 Aug 2013 09:50:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6307A20174 for ; Tue, 27 Aug 2013 09:50:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B4F82014B for ; Tue, 27 Aug 2013 09:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752757Ab3H0JuI (ORCPT ); Tue, 27 Aug 2013 05:50:08 -0400 Received: from mail-ee0-f44.google.com ([74.125.83.44]:54865 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752133Ab3H0JuH (ORCPT ); Tue, 27 Aug 2013 05:50:07 -0400 Received: by mail-ee0-f44.google.com with SMTP id b47so2160577eek.31 for ; Tue, 27 Aug 2013 02:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=DP7TrLOkGOlLyQdNzlWJ2YbUcknbM6G2HgIpybPrx4s=; b=q9OW81YuNNXArSOtc/OW17yaehTYAMEH4CNBLqXvCWYOu87ekroZ8c0wkrhkm+N/NI Tlu3lFXnGqcCdJzJp/y5c/TfOxKtzU8gNPZfWAVsHTdYRwIHMN9fTwvRm3CEvBxOHYN3 RkMmnECJXW29pqxk5ding7i0WfcM6f5nRfL5uBcFSa8JOGxaNKqVcvROeH7rq5coloSE Wdzyb+fCQS2SOFlSg3rtA453PJEhYqemte3B8HVwXAhExYyOXRTsYc7A1uo5OSYL4K/W fnf5JnBJpwg/0t5xKuTRDjm6+a3YHpuW9SN9Ve2S+9dYCVfx3jBG0uF7eLxIOsvdMJXf Kbfw== X-Received: by 10.14.127.4 with SMTP id c4mr2680577eei.61.1377597004231; Tue, 27 Aug 2013 02:50:04 -0700 (PDT) Received: from cosy-radosgw1.watje ([94.100.112.225]) by mx.google.com with ESMTPSA id r48sm27778717eev.14.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 Aug 2013 02:50:03 -0700 (PDT) From: "Roald J. van Loon" To: ceph-devel@vger.kernel.org Subject: [PATCH] cleanup: removed last references to g_conf from auth Date: Tue, 27 Aug 2013 11:49:57 +0200 Message-Id: <1377596997-973-1-git-send-email-roaldvanloon@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: References: 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 --- src/auth/cephx/CephxKeyServer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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(); 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);