From patchwork Tue Sep 18 21:15:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Mitchell X-Patchwork-Id: 10604887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 839286CB for ; Tue, 18 Sep 2018 21:15:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7156E2BDFE for ; Tue, 18 Sep 2018 21:15:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 650742BE15; Tue, 18 Sep 2018 21:15:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F31AE2BDFE for ; Tue, 18 Sep 2018 21:15:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729693AbeISCtp (ORCPT ); Tue, 18 Sep 2018 22:49:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42200 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729200AbeISCtp (ORCPT ); Tue, 18 Sep 2018 22:49:45 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A471E31500A4 for ; Tue, 18 Sep 2018 21:15:19 +0000 (UTC) Received: from wlan-196-148.bos.redhat.com (wlan-196-148.bos.redhat.com [10.16.196.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 400115C6C1; Tue, 18 Sep 2018 21:15:19 +0000 (UTC) Message-ID: <1537305318.8639.2.camel@redhat.com> Subject: [PATCH] nfs-utils: Add missing nfs.conf entries for various cmdline options From: Justin Mitchell To: linux-nfs@vger.kernel.org Cc: Steve Dickson Date: Tue, 18 Sep 2018 17:15:18 -0400 Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 18 Sep 2018 21:15:19 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add nfs.conf entries for various cmdline options These options did not have a corresponding nfs.conf entry which is currently forcing use of cmdline flags Signed-off-by: Justin Mitchell --- utils/gssd/gssd.c | 3 +++ utils/gssd/svcgssd.c | 4 ++++ utils/idmapd/idmapd.c | 8 ++++++++ utils/statd/sm-notify.c | 1 + 4 files changed, 16 insertions(+) diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 2c14e5f..00df2fc 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -888,6 +888,9 @@ main(int argc, char *argv[]) read_gss_conf(); + verbosity = conf_get_num("gssd", "Verbosity", verbosity); + rpc_verbosity = conf_get_num("gssd", "RPC-Verbosity", rpc_verbosity); + while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:T:R:")) != -1) { switch (opt) { case 'f': diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c index 8e918cc..ec49b61 100644 --- a/utils/gssd/svcgssd.c +++ b/utils/gssd/svcgssd.c @@ -113,6 +113,10 @@ main(int argc, char *argv[]) else principal = s; + verbosity = conf_get_num("svcgssd", "Verbosity", verbosity); + rpc_verbosity = conf_get_num("svcgssd", "RPC-Verbosity", rpc_verbosity); + idmap_verbosity = conf_get_num("svcgssd", "IDMAP-Verbosity", idmap_verbosity); + while ((opt = getopt(argc, argv, "fivrnp:")) != -1) { switch (opt) { case 'f': diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 4811e0f..d14eef7 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -261,6 +261,10 @@ main(int argc, char **argv) strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir)); CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User")); CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group")); + if (conf_get_bool("General", "server-only", false)) + clientstart = 0; + if (conf_get_bool("General", "client-only", false)) + serverstart = 0; } } else { conf_path = NFS_CONFFILE; @@ -276,6 +280,10 @@ main(int argc, char **argv) "cache-expiration", DEFAULT_IDMAP_CACHE_EXPIRY); CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User")); CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group")); + if (conf_get_bool("General", "server-only", false)) + clientstart = 0; + if (conf_get_bool("General", "client-only", false)) + serverstart = 0; } while ((opt = getopt(argc, argv, GETOPTSTR)) != -1) diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 7a48473..29dad38 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -503,6 +503,7 @@ main(int argc, char **argv) s = conf_get_str("statd", "state-directory-path"); if (s && !nsm_setup_pathnames(argv[0], s)) exit(1); + opt_update_state = conf_get_bool("sm-notify", "update-state", opt_update_state); while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) { switch (c) {