Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:55340 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934002AbdDEVMq (ORCPT ); Wed, 5 Apr 2017 17:12:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF0A62BB38B for ; Wed, 5 Apr 2017 21:12:44 +0000 (UTC) From: Scott Mayhew To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH v2 2/4] gssd: move the pipefs-directory setting to the nfs.conf global section Date: Wed, 5 Apr 2017 17:12:41 -0400 Message-Id: <20170405211243.12282-3-smayhew@redhat.com> In-Reply-To: <20170405211243.12282-1-smayhew@redhat.com> References: <20170405211243.12282-1-smayhew@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: All the daemons should use the same rpc_pipefs, so have them read the setting from the [global] section instead of from their program-specific section. Signed-off-by: Scott Mayhew --- nfs.conf | 1 - systemd/nfs.conf.man | 3 ++- utils/gssd/gssd.c | 4 +--- utils/gssd/gssd.man | 12 ++++++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nfs.conf b/nfs.conf index ed516f5..ae1e002 100644 --- a/nfs.conf +++ b/nfs.conf @@ -15,7 +15,6 @@ # limit-to-legacy-enctypes=0 # context-timeout=0 # rpc-timeout=5 -# pipefs-directory=/var/lib/nfs/rpc_pipefs # keytab-file=/etc/krb5.keytab # cred-cache-directory= # preferred-realm= diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man index f8849c5..fb59616 100644 --- a/systemd/nfs.conf.man +++ b/systemd/nfs.conf.man @@ -102,6 +102,8 @@ Recognized values: See .BR rpc.idmapd (8) +and +.BR rpc.gssd (8) for details. .TP @@ -214,7 +216,6 @@ Recognized values: .BR limit-to-legacy-enctypes , .BR context-timeout , .BR rpc-timeout , -.BR pipefs-directory , .BR keytab-file , .BR cred-cache-directory , .BR preferred-realm . diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 77125f1..cab3919 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -854,9 +854,7 @@ read_gss_conf(void) #endif context_timeout = conf_get_num("gssd", "context-timeout", context_timeout); rpc_timeout = conf_get_num("gssd", "rpc-timeout", rpc_timeout); - s = conf_get_str("gssd", "pipefs-directory"); - if (!s) - s = conf_get_str("general", "pipefs-directory"); + s = conf_get_str("global", "pipefs-directory"); if (s) pipefs_path = s; s = conf_get_str("gssd", "keytab-file"); diff --git a/utils/gssd/gssd.man b/utils/gssd/gssd.man index 87eef02..c90c49e 100644 --- a/utils/gssd/gssd.man +++ b/utils/gssd/gssd.man @@ -335,10 +335,6 @@ Equivalent to Equivalent to .BR -t . .TP -.B pipefs-directory -Equivalent to -.BR -p . -.TP .B keytab-file Equivalent to .BR -k . @@ -350,6 +346,14 @@ Equivalent to .B preferred-realm Equivalent to .BR -R . +.P +In addtion, the following value is recognized from the +.B [global] +section: +.TP +.B pipefs-directory +Equivalent to +.BR -p . .SH SEE ALSO .BR rpc.svcgssd (8), -- 2.9.3