[Freeipa-devel] [PATCH] slapi-nis support for trusted domains

[Jakub Hrozek]

On Tue, Jul 16, 2013 at 01:23:41PM +0300, Alexander Bokovoy wrote:
> Hi!
> 
> On Tue, 16 Jul 2013, Jakub Hrozek wrote:
> >>+AC_ARG_WITH(sss_nss_idmap,
> >>+	    AS_HELP_STRING([--with-sss-nss-idmap], [use libsss_nss_idmap]),
> >>+	    use_sss_nss_idmap=$withval,use_sss_nss_idmap=AUTO)
> >>+if pkg-config sss_nss_idmap 2> /dev/null ; then
> >>+	    if test x$use_sss_nss_idmap != xno ; then
> >>+		AC_DEFINE(HAVE_SSS_NSS_IDMAP,1,[Define if you have libsss_nss_idmap.])
> >>+		PKG_CHECK_MODULES(SSS_NSS_IDMAP,sss_nss_idmap)
> >>+	    else
> >>+		SSS_NSS_IDMAP_CFLAGS=
> >>+		SSS_NSS_IDMAP_LIBS=
> >>+	    fi
> >>+else
> >>+	if test $use_sss_idmap = yes ; then
> >>+		PKG_CHECK_MODULES(SSS_NSS_IDMAP,sss_nss_idmap)
> >>+	else
> >>+		SSS_NSS_IDMAP_CFLAGS=
> >>+		SSS_NSS_IDMAP_LIBS=
> >>+	fi
> >>+fi
> >>+AM_CONDITIONAL([SSS_NSS_IDMAP], [test x$SSS_NSS_IDMAP_LIBS != x])
> >>+AC_SUBST(SSS_NSS_IDMAP_CFLAGS)
> >>+AC_SUBST(SSS_NSS_IDMAP_LIBS)
> >>+
> >>+if x$SSS_NSS_IDMAP_LIBS != x ; then
> >
> >I think you should use test or square brackets here, otherwise I'm
> >seeing:
> >
> >checking for SSS_NSS_IDMAP... yes
> >./configure: line 12952: x-lsss_nss_idmap: command not found
> Thanks, added 'test ...'
> 
> >
> >>+	AC_CHECK_HEADERS(pam.h)
> >
> >I don't see any pam.h in pam-devel RPM. In SSSD we look for
> >security/pam_appl.h
> Right. Fixed.
> 
> >>--- a/src/Makefile.am
> >>+++ b/src/Makefile.am
> >>@@ -51,6 +51,7 @@ nisserver_plugin_la_LIBADD = $(LDAP_LIBS) $(RUNTIME_LIBS) $(TIRPC_LIBS) $(LIBWRA
> >>
> >> schemacompat_plugin_la_SOURCES = \
> >> 	back-sch.c \
> >>+	back-sch.h \
> >
> >This file is only added in the second patch, so maybe the whole
> >Makefile.am hunk should be moved there.
> Yes, moved to the second patch.
> 
> New patchset is attached.
> -- 
> / Alexander Bokovoy

Thanks for the changes, one more comment about patch #1:

> +if test x$SSS_NSS_IDMAP_LIBS != x ; then
> +	AC_CHECK_HEADERS(security/pam_appl.h)
> +	if test x$ac_cv_header_pam_h = xno ; then

I think you need to check for ac_cv_header_security_pam_appl_h here.
Also the condition seems reversed to me, it was complaining about
missing PAM-devel even when I had one.

After changing the test to use ac_cv_header_security_pam_appl_h the
and reverting the condition configure seems to have worked correctly for me.

Here is the git diff I made:
diff --git a/configure.ac b/configure.ac
index aac52e2..085f51d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,7 +334,7 @@ AC_SUBST(SSS_NSS_IDMAP_LIBS)
 
 if test x$SSS_NSS_IDMAP_LIBS != x ; then
        AC_CHECK_HEADERS(security/pam_appl.h)
-       if test x$ac_cv_header_pam_h = xno ; then
+       if test x$ac_cv_header_security_pam_appl_h = xyes ; then
                use_pam=yes
        else
                use_pam=no