2019-03-11 17:55:24

by Steve Dickson

Subject: [PATCH] gssd: add verbosity options to the rpc.gssd man page

From: Pierguido Lambri <[email protected]>

It also adds the commented out entries in the nfs.conf
default file.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1668026

Signed-off-by: Pierguido Lambri <[email protected]>
Signed-off-by: Steve Dickson <[email protected]>
---
nfs.conf | 2 ++
systemd/nfs.conf.man | 2 ++
utils/gssd/gssd.c | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nfs.conf b/nfs.conf
index d332375..faa07b1 100644
--- a/nfs.conf
+++ b/nfs.conf
@@ -9,6 +9,8 @@
# debug=0
#
[gssd]
+# verbosity=0
+# rpc-verbosity=0
# use-memcache=0
# use-machine-creds=1
# use-gss-proxy=0
diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man
index 699db3f..e3654a3 100644
--- a/systemd/nfs.conf.man
+++ b/systemd/nfs.conf.man
@@ -211,6 +211,8 @@ for details.
.TP
.B gssd
Recognized values:
+.BR verbosity ,
+.BR rpc-verbosity ,
.BR use-memcache ,
.BR use-machine-creds ,
.BR use-gss-proxy ,
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
index 7eeb05f..19ad4da 100644
--- a/utils/gssd/gssd.c
+++ b/utils/gssd/gssd.c
@@ -890,8 +890,8 @@ 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);
+ 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) {
--
2.20.1

2019-03-12 13:17:58

by Steve Dickson

Subject: Re: [PATCH] gssd: add verbosity options to the rpc.gssd man page

On 3/11/19 1:55 PM, Steve Dickson wrote:
> From: Pierguido Lambri <[email protected]>
>
> It also adds the commented out entries in the nfs.conf
> default file.
>
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1668026
>
> Signed-off-by: Pierguido Lambri <[email protected]>
> Signed-off-by: Steve Dickson <[email protected]>
> ---
> nfs.conf | 2 ++
> systemd/nfs.conf.man | 2 ++
> utils/gssd/gssd.c | 4 ++--
> 3 files changed, 6 insertions(+), 2 deletions(-)
Committed...

steved.
>
> diff --git a/nfs.conf b/nfs.conf
> index d332375..faa07b1 100644
> --- a/nfs.conf
> +++ b/nfs.conf
> @@ -9,6 +9,8 @@
> # debug=0
> #
> [gssd]
> +# verbosity=0
> +# rpc-verbosity=0
> # use-memcache=0
> # use-machine-creds=1
> # use-gss-proxy=0
> diff --git a/systemd/nfs.conf.man b/systemd/nfs.conf.man
> index 699db3f..e3654a3 100644
> --- a/systemd/nfs.conf.man
> +++ b/systemd/nfs.conf.man
> @@ -211,6 +211,8 @@ for details.
> .TP
> .B gssd
> Recognized values:
> +.BR verbosity ,
> +.BR rpc-verbosity ,
> .BR use-memcache ,
> .BR use-machine-creds ,
> .BR use-gss-proxy ,
> diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c
> index 7eeb05f..19ad4da 100644
> --- a/utils/gssd/gssd.c
> +++ b/utils/gssd/gssd.c
> @@ -890,8 +890,8 @@ 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);
> + 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) {
>