From patchwork Tue Sep 23 16:21:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 4958431 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 64C8E9F3DF for ; Tue, 23 Sep 2014 16:48:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42CC520263 for ; Tue, 23 Sep 2014 16:48:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A22B620260 for ; Tue, 23 Sep 2014 16:48:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932302AbaIWQsJ (ORCPT ); Tue, 23 Sep 2014 12:48:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44944 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932298AbaIWQsI (ORCPT ); Tue, 23 Sep 2014 12:48:08 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8NGm8RP024456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 23 Sep 2014 12:48:08 -0400 Received: from smallhat.boston.devel.redhat.com (vpn-55-23.rdu2.redhat.com [10.10.55.23]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8NGLhMu027727 for ; Tue, 23 Sep 2014 12:21:45 -0400 From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 1/2] rpc.svcgssd: Add a configure switch to disable building the daemon Date: Tue, 23 Sep 2014 12:21:40 -0400 Message-Id: <1411489301-28991-2-git-send-email-steved@redhat.com> In-Reply-To: <1411489301-28991-1-git-send-email-steved@redhat.com> References: <1411489301-28991-1-git-send-email-steved@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 + else + enable_svcgss= + SVCGSSD= + fi + 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 = \