[nfs-utils,v3,2/4] gssd: add a deprecation warning for pipefs-directory in gssd section
diff mbox

Message ID 20170406163104.28397-3-smayhew@redhat.com
State New
Headers show

Commit Message

Scott Mayhew April 6, 2017, 4:31 p.m. UTC
All the daemons should use the same rpc_pipefs, so pipefs-directory
should be specified in the [general] section.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 nfs.conf             |  1 -
 systemd/nfs.conf.man |  3 ++-
 utils/gssd/gssd.c    |  4 ++++
 utils/gssd/gssd.man  | 12 ++++++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

Comments

Steve Dickson April 10, 2017, 1:36 p.m. UTC | #1
On 04/06/2017 12:31 PM, Scott Mayhew wrote:
> All the daemons should use the same rpc_pipefs, so pipefs-directory
> should be specified in the [general] section.
> 
> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Committed... 

steved.
> ---
>  nfs.conf             |  1 -
>  systemd/nfs.conf.man |  3 ++-
>  utils/gssd/gssd.c    |  4 ++++
>  utils/gssd/gssd.man  | 12 ++++++++----
>  4 files changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/nfs.conf b/nfs.conf
> index 0828bdd..10d383d 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 e493ea3..1a72da0 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..28f9649 100644
> --- a/utils/gssd/gssd.c
> +++ b/utils/gssd/gssd.c
> @@ -857,6 +857,10 @@ read_gss_conf(void)
>  	s = conf_get_str("gssd", "pipefs-directory");
>  	if (!s)
>  		s = conf_get_str("general", "pipefs-directory");
> +	else
> +		printerr(0, "WARNING: Specifying pipefs-directory in the [gssd] "
> +			 "section of %s is deprecated.  Use the [general] "
> +			 "section instead.", NFS_CONFFILE);
>  	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..e620f0d 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 [general]
> +section:
> +.TP
> +.B pipefs-directory
> +Equivalent to
> +.BR -p .
>  
>  .SH SEE ALSO
>  .BR rpc.svcgssd (8),
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/nfs.conf b/nfs.conf
index 0828bdd..10d383d 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 e493ea3..1a72da0 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..28f9649 100644
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -857,6 +857,10 @@  read_gss_conf(void)
 	s = conf_get_str("gssd", "pipefs-directory");
 	if (!s)
 		s = conf_get_str("general", "pipefs-directory");
+	else
+		printerr(0, "WARNING: Specifying pipefs-directory in the [gssd] "
+			 "section of %s is deprecated.  Use the [general] "
+			 "section instead.", NFS_CONFFILE);
 	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..e620f0d 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 [general]
+section:
+.TP
+.B pipefs-directory
+Equivalent to
+.BR -p .
 
 .SH SEE ALSO
 .BR rpc.svcgssd (8),