Re: [PATCH 1/2] rpc.svcgssd: Add a configure switch to disable building the daemon

NeilBrown
2014-11-05T02:56:42Z

[-- Attachment #1: Type: text/plain, Size: 2920 bytes --]

On Tue, 23 Sep 2014 12:21:40 -0400 Steve Dickson <steved@redhat.com> wrote:

> Now that gssproxy is supported on modern kernels,
> the svcgssd is no longer needed. This switch
> disables the building of the daemon.
>
> Signed-off-by: Steve Dickson <steved@redhat.com>
> ---
> configure.ac | 23 +++++++++++++++++++----
> utils/gssd/Makefile.am | 11 +++++++++--
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index bc48373..b63d821 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -90,21 +90,36 @@ AC_ARG_ENABLE(nfsv41,
>
> AC_ARG_ENABLE(gss,
> [AC_HELP_STRING([--enable-gss],
> - [enable support for rpcsec_gss @<:@default=yes@:>@])],
> + [enable client support for rpcsec_gss @<:@default=yes@:>@])],
> enable_gss=$enableval,
> enable_gss=yes)
> if test "$enable_gss" = yes; then
> GSSD=gssd
> - SVCGSSD=svcgssd
> else
> enable_gss=
> GSSD=
> - SVCGSSD=
> fi
> AC_SUBST(GSSD)
> - AC_SUBST(SVCGSSD)
> AC_SUBST(enable_gss)
> AM_CONDITIONAL(CONFIG_GSS, [test "$enable_gss" = "yes"])
> +
> +AC_ARG_ENABLE(svcgss,
> + [AC_HELP_STRING([--enable-svcgss],
> + [dissable building svcgssd for rpcsec_gss server support @<:@default=yes@:>@])],
> + enable_svcgss=$enableval,
> + enable_svcgss=yes)
> + if test "$enable_gss" = yes; then
> + if "enable_svcgss" = yes; then
> + SVCGSSD=svcgssd
> + fi

Hi Steve,
I just noticed that this causes an error when I try "./configure".
It tries to run a program called "enable_svcgss" with args "=" and "yes",
but this fails....

A simple fix would leave the code doing nothing if enable_gss = yes, but
enable_svcgss = no. Is that what you want?

Should it be:

if test "$enable_gss" = yes -a "$enable_svcgss" = yes; then
SVCGSSD=svcgssd
> + else
> + enable_svcgss=
> + SVCGSSD=
> + fi

??

Would you like a patch, or will you just fix it up?

Thanks,
NeilBrown

> + AC_SUBST(SVCGSSD)
> + AC_SUBST(enable_svcgss)
> + AM_CONDITIONAL(CONFIG_SVCGSS, [test "$enable_svcgss" = "yes"])
> +
> AC_ARG_ENABLE(kprefix,
> [AC_HELP_STRING([--enable-kprefix], [install progs as rpc.knfsd etc])],
> test "$enableval" = "yes" && kprefix=k,
> diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
> index af59791..9835117 100644
> --- a/utils/gssd/Makefile.am
> +++ b/utils/gssd/Makefile.am
> @@ -1,10 +1,17 @@
> ## Process this file with automake to produce Makefile.in
>
> -man8_MANS = gssd.man svcgssd.man
> +man8_MANS = gssd.man
> +if CONFIG_SVCGSS
> +man8_MANS += svcgssd.man
> +endif
>
> RPCPREFIX = rpc.
> KPREFIX = @kprefix@
> -sbin_PREFIXED = gssd svcgssd
> +sbin_PREFIXED = gssd
> +if CONFIG_SVCGSS
> +sbin_PREFIXED += svcgssd
> +endif
> +
> sbin_PROGRAMS = $(sbin_PREFIXED)
>
> EXTRA_DIST = \

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]