From patchwork Fri Oct 19 21:07:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 192807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "rcsinet15.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id F3A952C0090 for ; Sat, 20 Oct 2012 08:08:01 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q9JL7wnp001154 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 19 Oct 2012 21:07:58 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q9JL7vlr004131 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Oct 2012 21:07:57 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TPJnR-0007Ft-KL; Fri, 19 Oct 2012 14:07:57 -0700 Received: from acsinet21.oracle.com ([141.146.126.237]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TPJnQ-0007Fl-1y for fedfs-utils-devel@oss.oracle.com; Fri, 19 Oct 2012 14:07:56 -0700 Received: from acsinet11.oracle.com (acsinet11.oracle.com [141.146.126.233]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q9JL7tNR029372 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Oct 2012 21:07:55 GMT Received: from mail-ia0-f171.google.com (mail-ia0-f171.google.com [209.85.210.171]) by acsinet11.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q9JL7bV3005718 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Fri, 19 Oct 2012 21:07:55 GMT Received: by mail-ia0-f171.google.com with SMTP id u21so674450ial.2 for ; Fri, 19 Oct 2012 14:07:54 -0700 (PDT) Received: by 10.50.100.137 with SMTP id ey9mr2811677igb.57.1350680874844; Fri, 19 Oct 2012 14:07:54 -0700 (PDT) Received: from seurat.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPS id wh5sm16647395igb.17.2012.10.19.14.07.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 14:07:54 -0700 (PDT) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Fri, 19 Oct 2012 17:07:53 -0400 Message-ID: <20121019210753.53119.64147.stgit@seurat.1015granger.net> In-Reply-To: <20121019210357.53119.28925.stgit@seurat.1015granger.net> References: <20121019210357.53119.28925.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=Default reputation=ipRepBelow100 ip=209.85.210.171 ct-class=G1 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=0 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=2777 X-MM-CT-Classification: not spam X-MM-CT-RefID: str=0001.0A090208.5081C12B.0084,ss=1,re=0.000,fgs=0 Subject: [fedfs-utils] [PATCH 02/11] libnsdb: Remove references to fedfsd from the NSDB parameter database code X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] Clean up: The state dir is no longer used only by fedfsd. Introduced by commit 0520ee72 "Initial commit" March 29, 2011. Signed-off-by: Chuck Lever --- src/libnsdb/nsdb.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libnsdb/nsdb.c b/src/libnsdb/nsdb.c index 2ec13e2..b2325fb 100644 --- a/src/libnsdb/nsdb.c +++ b/src/libnsdb/nsdb.c @@ -76,7 +76,7 @@ /** - * Stores pathname of directory containing fedfsd persistent state + * Stores pathname of directory containing FedFS persistent state */ char fedfs_base_dirname[PATH_MAX + 1] = FEDFS_DEFAULT_STATEDIR; @@ -93,7 +93,7 @@ char fedfs_nsdbcerts_dirname[PATH_MAX + 1] = FEDFS_DEFAULT_STATEDIR "/" FEDFS_NSDBCERT_DIR; /** - * Stores pathname of database containing fedfsd persistent state + * Stores pathname of database containing FedFS persistent state */ static char fedfs_db_filename[PATH_MAX] = FEDFS_DEFAULT_STATEDIR "/" FEDFS_DATABASE_FILE; @@ -115,7 +115,7 @@ nsdb_set_parentdir(const char *parentdir) char *path; int len; - xlog(D_CALL, "%s: Setting up %s as our fedfs directory", + xlog(D_CALL, "%s: Setting up %s as our FedFS state directory", __func__, parentdir); /* First: test length of name and whether it exists */ @@ -139,14 +139,14 @@ nsdb_set_parentdir(const char *parentdir) len = snprintf(buf, sizeof(buf), "%s/%s", parentdir, FEDFS_DATABASE_FILE); if (len > PATH_MAX) { - xlog(L_ERROR, "Fedfsd database pathname is too long"); + xlog(L_ERROR, "FedFS database pathname is too long"); return false; } strcpy(fedfs_db_filename, buf); len = snprintf(buf, sizeof(buf), "%s/%s", parentdir, FEDFS_NSDBCERT_DIR); if (len > PATH_MAX) { - xlog(L_ERROR, "Fedfsd cert directory pathname is too long"); + xlog(L_ERROR, "FedFS cert directory pathname is too long"); return false; } strcpy(fedfs_nsdbcerts_dirname, buf); @@ -159,7 +159,7 @@ nsdb_set_parentdir(const char *parentdir) /** * Predicate: Does parent directory refer to default FedFS state directory? * - * @return true if active fedfsd directory is same as default + * @return true if active FedFS state directory is same as default */ _Bool nsdb_is_default_parentdir(void) @@ -540,9 +540,7 @@ nsdb_new_certfile(const char *certdata, const unsigned int certlen, /* * We require a guaranteed unique file name for each * new cert. Use uuid_generate_time(3) to avoid - * depleting the local entropy pool. These files are - * private to fedfsd, so no undue exposure of the - * local time or MAC address is expected. + * depleting the local entropy pool. */ uuid_generate_time(uu); uuid_unparse(uu, uuidbuf);