Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:44358 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbdIMOGM (ORCPT ); Wed, 13 Sep 2017 10:06:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0E967EA85 for ; Wed, 13 Sep 2017 14:06:12 +0000 (UTC) Message-ID: <1505311561.15819.29.camel@redhat.com> Subject: [PATCH 6/7] nfs-utils: integrate libnfsidmap code with rest of nfs-utils From: Justin Mitchell To: Steve Dickson Cc: linux-nfs , Bruce Fields Date: Wed, 13 Sep 2017 15:06:01 +0100 In-Reply-To: <1505311126.15819.20.camel@redhat.com> References: <1505311126.15819.20.camel@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org List-ID: Modify libnfsidmap to use the now shared conffile code, adjust the build structure to generate everything correctly, and modify the other utils to use the merged version of libnfsidmap instead of testing for an external dependancy. Signed-off-by: Justin Mitchell --- configure.ac | 50 +++++++++++++++++++++++++++++++++++------ utils/Makefile.am | 3 +-- utils/gssd/Makefile.am | 3 ++- utils/idmapd/Makefile.am | 4 +++- utils/libnfsidmap/Makefile.am | 5 ++--- utils/libnfsidmap/libnfsidmap.c | 5 +++-- utils/libnfsidmap/nss.c | 2 +- utils/libnfsidmap/static.c | 5 ++--- utils/libnfsidmap/umich_ldap.c | 2 +- utils/nfsidmap/Makefile.am | 4 +++- 10 files changed, 61 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index 1ca1603..a2f72af 100644 --- a/configure.ac +++ b/configure.ac @@ -304,9 +304,6 @@ if test "$enable_nfsv4" = yes; then dnl check for libevent libraries and headers AC_LIBEVENT - dnl check for nfsidmap libraries and headers - AC_LIBNFSIDMAP - dnl check for the keyutils libraries and headers AC_KEYUTILS @@ -339,7 +336,6 @@ fi dnl enable nfsidmap when its support by libnfsidmap AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) -AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) if test "$knfsd_cv_glibc2" = no; then @@ -382,9 +378,6 @@ if test "$enable_gss" = yes; then dnl check for libevent libraries and headers AC_LIBEVENT - dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c - AC_LIBNFSIDMAP - dnl Check for Kerberos V5 AC_KERBEROS_V5 @@ -407,6 +400,47 @@ if test "$enable_gss" = yes; then fi fi +dnl libdnsidmap specific checks +AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) + +AC_ARG_ENABLE([ldap], + [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) + +dnl will libdnsidmap support LDAP ? +if test "x$enable_ldap" != "xno" ; then + AC_CHECK_HEADER([ldap.h], + [AC_CHECK_LIB([ldap], [ldap_initialize], + [have_ldap="yes"],[have_ldap="no"])], + [have_ldap="no"]) + if test "x$have_ldap" = "xyes" ; then + AC_DEFINE([ENABLE_LDAP], 1, [Enable LDAP Support]) + elif test "x$enable_ldap$have_ldap" = "xyesno" ; then + AC_MSG_ERROR(LDAP support not found!) + fi +fi +AM_CONDITIONAL(ENABLE_LDAP, test "x$have_ldap" = "xyes") + +dnl Should we build gums mapping library? +AC_ARG_ENABLE([gums], + [AS_HELP_STRING([--enable-gums],[Enable support for the GUMS mapping library @<:@default=false@:>@])]) +if test "x$enable_gums" = "xyes" ; then + AC_DEFINE([ENABLE_GUMS], 1, [Enable GUMS mapping library support]) +fi +AM_CONDITIONAL(ENABLE_GUMS, test "x$enable_gums" = "xyes") + +dnl Where do the Plugins live +AC_ARG_WITH(pluginpath, + [AS_HELP_STRING([--with-pluginpath=/foo],[Causes the library to look in /foo instead of /usr/lib/libnfsidmap for plugins + ])], + path_plugins=$withval, + path_plugins="" + ) +if test -n "$path_plugins" ; then + AC_DEFINE_UNQUOTED(PATH_PLUGINS, "$path_plugins", + [Define this to change the plugins path]) +fi +AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins") + dnl Check for IPv6 support AC_IPV6 @@ -550,6 +584,8 @@ AC_CONFIG_FILES([ utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile + utils/libnfsidmap/Makefile + utils/libnfsidmap/libnfsidmap.pc utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile diff --git a/utils/Makefile.am b/utils/Makefile.am index b892dc8..7dfc13a 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,11 +3,10 @@ OPTDIRS = if CONFIG_NFSV4 +OPTDIRS += libnfsidmap OPTDIRS += idmapd -if CONFIG_NFSIDMAP OPTDIRS += nfsidmap endif -endif if CONFIG_NFSV41 OPTDIRS += blkmapd diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index 09a455e..dcfc8a7 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -75,7 +75,8 @@ svcgssd_SOURCES = \ svcgssd_LDADD = \ ../../support/nfs/libnfs.la \ - $(RPCSECGSS_LIBS) $(LIBNFSIDMAP) \ + ../../utils/libnfsidmap/libnfsidmap.la \ + $(RPCSECGSS_LIBS) \ $(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC) svcgssd_LDFLAGS = $(KRBLDFLAGS) diff --git a/utils/idmapd/Makefile.am b/utils/idmapd/Makefile.am index b4cac93..7bc11a8 100644 --- a/utils/idmapd/Makefile.am +++ b/utils/idmapd/Makefile.am @@ -15,7 +15,9 @@ idmapd_SOURCES = \ nfs_idmap.h \ queue.h -idmapd_LDADD = ../../support/nfs/libnfs.la $(LIBEVENT) $(LIBNFSIDMAP) +idmapd_LDADD = ../../support/nfs/libnfs.la \ + ../../utils/libnfsidmap/libnfsidmap.la \ + $(LIBEVENT) MAINTAINERCLEANFILES = Makefile.in diff --git a/utils/libnfsidmap/Makefile.am b/utils/libnfsidmap/Makefile.am index 85f19c8..458944f 100644 --- a/utils/libnfsidmap/Makefile.am +++ b/utils/libnfsidmap/Makefile.am @@ -1,4 +1,3 @@ -ACLOCAL_AMFLAGS = -I m4 if ENABLE_LDAP UMICH_LDAP_LIB = umich_ldap.la @@ -25,9 +24,9 @@ pkglib_LTLIBRARIES = nsswitch.la static.la $(UMICH_LDAP_LIB) $(GUMS_MAPPING_LIB) # The number of previous additional interfaces supported # by this library. -libnfsidmap_la_SOURCES = libnfsidmap.c cfg.c strlcpy.c cfg.h nfsidmap_internal.h queue.h +libnfsidmap_la_SOURCES = libnfsidmap.c nfsidmap_internal.h libnfsidmap_la_LDFLAGS = -version-info 3:0:3 -libnfsidmap_la_LIBADD = -ldl +libnfsidmap_la_LIBADD = -ldl ../../support/nfs/libnfsconf.la nsswitch_la_SOURCES = nss.c nsswitch_la_LDFLAGS = -module -avoid-version diff --git a/utils/libnfsidmap/libnfsidmap.c b/utils/libnfsidmap/libnfsidmap.c index d484101..aa368b7 100644 --- a/utils/libnfsidmap/libnfsidmap.c +++ b/utils/libnfsidmap/libnfsidmap.c @@ -59,7 +59,7 @@ #include "nfsidmap.h" #include "nfsidmap_internal.h" -#include "cfg.h" +#include "conffile.h" static char *default_domain; static struct conf_list *local_realms; @@ -340,6 +340,7 @@ int nfs4_init_name_mapping(char *conffile) char *nobody_user, *nobody_group; char *nostrip; char *reformatgroup; + char *conf_path; /* XXX: need to be able to reload configurations... */ if (nfs4_plugins) /* already succesfully initialized */ @@ -348,7 +349,7 @@ int nfs4_init_name_mapping(char *conffile) conf_path = conffile; else conf_path = PATH_IDMAPDCONF; - conf_init(); + conf_init(conf_path); default_domain = conf_get_str("General", "Domain"); if (default_domain == NULL) { dflt = 1; diff --git a/utils/libnfsidmap/nss.c b/utils/libnfsidmap/nss.c index 82799ce..48215ff 100644 --- a/utils/libnfsidmap/nss.c +++ b/utils/libnfsidmap/nss.c @@ -48,7 +48,7 @@ #include #include "nfsidmap.h" #include "nfsidmap_internal.h" -#include "cfg.h" +#include "conffile.h" #include /* diff --git a/utils/libnfsidmap/static.c b/utils/libnfsidmap/static.c index 9f587af..37b293b 100644 --- a/utils/libnfsidmap/static.c +++ b/utils/libnfsidmap/static.c @@ -41,8 +41,7 @@ #include #include -#include "queue.h" -#include "cfg.h" +#include "conffile.h" #include "nfsidmap.h" #include "nfsidmap_internal.h" @@ -317,7 +316,7 @@ static int static_init() { LIST_INIT (&uid_mappings[i]); //get all principals for which we have mappings - princ_list = conf_get_tag_list("Static"); + princ_list = conf_get_tag_list("Static", NULL); if (!princ_list) { return -ENOENT; diff --git a/utils/libnfsidmap/umich_ldap.c b/utils/libnfsidmap/umich_ldap.c index 886fa0c..664f282 100644 --- a/utils/libnfsidmap/umich_ldap.c +++ b/utils/libnfsidmap/umich_ldap.c @@ -48,7 +48,7 @@ #include #include "nfsidmap.h" #include "nfsidmap_internal.h" -#include "cfg.h" +#include "conffile.h" /* attribute/objectclass default mappings */ #define DEFAULT_UMICH_OBJCLASS_REMOTE_PERSON "NFSv4RemotePerson" diff --git a/utils/nfsidmap/Makefile.am b/utils/nfsidmap/Makefile.am index 8af22d0..96e6c09 100644 --- a/utils/nfsidmap/Makefile.am +++ b/utils/nfsidmap/Makefile.am @@ -4,7 +4,9 @@ man8_MANS = nfsidmap.man sbin_PROGRAMS = nfsidmap nfsidmap_SOURCES = nfsidmap.c -nfsidmap_LDADD = $(LIBNFSIDMAP) -lkeyutils ../../support/nfs/libnfs.la +nfsidmap_LDADD = -lkeyutils \ + ../../support/nfs/libnfs.la \ + ../../utils/libnfsidmap/libnfsidmap.la MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = id_resolver.conf $(man8_MANS) -- 1.8.3.1