2018-01-03 13:25:36

by Justin Mitchell

Subject: [PATCH] nfs-utils: Update svcgssd so that it builds

Since a15bd948 the --enable-svcgss option no longer builds
as svcgssd references functions which were changed at that time.
Fix those, and other function changes since then.

Signed-off-by: Justin Mitchell <[email protected]>
---
utils/gssd/svcgssd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
index 3514ae1..23f0c0b 100644
--- a/utils/gssd/svcgssd.c
+++ b/utils/gssd/svcgssd.c
@@ -63,6 +63,8 @@
#include "err_util.h"
#include "conffile.h"

+struct state_paths etab;
+
void
sig_die(int signal)
{
@@ -101,7 +103,7 @@ main(int argc, char *argv[])
char *principal = NULL;
char *s;

- conf_init(NFS_CONFFILE);
+ conf_init_file(NFS_CONFFILE);

s = conf_get_str("svcgssd", "principal");
if (!s)
--
1.8.3.1

2018-01-08 14:15:51

by Steve Dickson

Subject: Re: [PATCH] nfs-utils: Update svcgssd so that it builds

On 01/03/2018 08:25 AM, Justin Mitchell wrote:
> Since a15bd948 the --enable-svcgss option no longer builds
> as svcgssd references functions which were changed at that time.
> Fix those, and other function changes since then.
>
> Signed-off-by: Justin Mitchell <[email protected]>
Committed...

steved.

> ---
> utils/gssd/svcgssd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c
> index 3514ae1..23f0c0b 100644
> --- a/utils/gssd/svcgssd.c
> +++ b/utils/gssd/svcgssd.c
> @@ -63,6 +63,8 @@
> #include "err_util.h"
> #include "conffile.h"
>
> +struct state_paths etab;
> +
> void
> sig_die(int signal)
> {
> @@ -101,7 +103,7 @@ main(int argc, char *argv[])
> char *principal = NULL;
> char *s;
>
> - conf_init(NFS_CONFFILE);
> + conf_init_file(NFS_CONFFILE);
>
> s = conf_get_str("svcgssd", "principal");
> if (!s)
>