[SSSD] [PATCH] Build cifs plugin depending on the existence of cifsidmap.h

Lukas Slebodnik lslebodn at redhat.com
Mon Nov 4 17:07:59 UTC 2013


On (04/11/13 11:51), Simo Sorce wrote:
>On Mon, 2013-11-04 at 16:44 +0100, Sumit Bose wrote:
>> On Mon, Nov 04, 2013 at 10:36:56AM -0500, Simo Sorce wrote:
>> > On Mon, 2013-11-04 at 16:21 +0100, Sumit Bose wrote:
>> > > On Mon, Nov 04, 2013 at 12:05:15PM +0100, Lukas Slebodnik wrote:
>> > > > On (01/11/13 18:41), Sumit Bose wrote:
>> > > > >Hi,
>> > > > >
>> > > > >with this patch it is not required anymore to have cifs-utils-devel
>> > > > >installed for the default build.
>> > > > >
>> > > > >Fixes https://fedorahosted.org/sssd/ticket/2125
>> > > > >
>> > > > >bye,
>> > > > >Sumit
>> > > > 
>> > > > >From 35f5932946d67a943146411a336afac34a78fb90 Mon Sep 17 00:00:00 2001
>> > > > >From: Sumit Bose <sbose at redhat.com>
>> > > > >Date: Fri, 1 Nov 2013 18:33:32 +0100
>> > > > >Subject: [PATCH] Build cifs plugin depending on the existence of cifsidmap.h
>> > > > >
>> > > > >To allow the "configure; make; make install" scheme on systems where
>> > > > >cifsidmap.h is not available the cifs-utils plugin is only build if the
>> > > > >include file is available and not build if it is not available.
>> > > > >
>> > > > >If the configure option --enable-cifs-idmap-plugin is used, configure
>> > > > >will fail if cifsidmap.h is not available.
>> > > > >
>> > > > >Fixes https://fedorahosted.org/sssd/ticket/2125
>> > > > >---
>> > > > > src/external/cifsidmap.m4 | 17 ++++++++++-------
>> > > > > 1 file changed, 10 insertions(+), 7 deletions(-)
>> > > > >
>> > > > >diff --git a/src/external/cifsidmap.m4 b/src/external/cifsidmap.m4
>> > > > >index 53cb8b7..fbcbe65 100644
>> > > > >--- a/src/external/cifsidmap.m4
>> > > > >+++ b/src/external/cifsidmap.m4
>> > > > >@@ -2,15 +2,18 @@ AC_ARG_ENABLE([cifs-idmap-plugin],
>> > > > >               [AS_HELP_STRING([--disable-cifs-idmap-plugin],
>> > > > >                               [do not build CIFS idmap plugin])],
>> > > > >               [build_cifs_idmap_plugin=$enableval],
>> > > > >-              [build_cifs_idmap_plugin=yes])
>> > > > >+              [build_cifs_idmap_plugin=auto])
>> > > > > 
>> > > > >-AS_IF([test x$build_cifs_idmap_plugin = xyes],
>> > > > >-      [AC_CHECK_HEADER([cifsidmap.h], [],
>> > > > >-                       [AC_MSG_ERROR([you must have the cifsidmap header installed to build the idmap plugin])])
>> > > > >-      ])
>> > > > 
>> > > > I have an idea. We can leave default value "yes" and extend AC_MSG_ERROR
>> > > > message. For example:
>> > > > "You can disable cifs plugin with parameter --disable-cifs-idmap-plugin"
>> > > > 
>> > > > Is it a bad idea?
>> > > 
>> > > I would like to hear Simo's opinion on both suggestions, before doing
>> > > any changes.
>> > 
>> > As long as it is possible to build without the idmap plugin I do not
>> > really care what is the default, use your best judgment.
>> > The problem is in that not being an option, not in what we use as
>> > default.
>> 
>> Configure options --disable-cifs-idmap-plugin and
>> --enable-cifs-idmap-plugin are already available, so no change is
>> needed?
>
>When I opened the bug they were not ...
They *were*.

Ticket was opened "2013-10-22T00:21:26 02:00" and patches were commited
few days ago.

commit c3b1e99007d5f0069fbbd32a3df799d71ea4882e
Author:     Sumit Bose <sbose at redhat.com>
AuthorDate: Mon Oct 14 12:47:59 2013 +0200
Commit:     Sumit Bose <sbose at redhat.com>
CommitDate: Tue Oct 15 11:36:37 2013 +0200

    Spec file changes for cifs-utils plugin

commit af4ffe1001adcc0a96897e426d26444f07af9aa1
Author:     Benjamin Franzke <benjaminfranzke at googlemail.com>
AuthorDate: Thu Sep 26 10:27:33 2013 +0200
Commit:     Sumit Bose <sbose at redhat.com>
CommitDate: Tue Oct 15 11:36:32 2013 +0200

    Add CIFS idmap plugin

    https://fedorahosted.org/sssd/ticket/1534

>
>Does --disable-cifs-idmap-plugin allow you to build if you do not have
>the required headers ?
Yes, because RHEL6 does not have header file cifsidmap.h

--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -41,6 +41,12 @@
 %define _hardened_build 1
 %endif

+%if (0%{?fedora} >= 17 || 0%{?rhel} >= 7)
+    %global with_cifs_utils_plugin 1
+%else
+    %global with_cifs_utils_plugin_option --disable-cifs-idmap-plugin
+%endif
+

LS



More information about the sssd-devel mailing list