Adding upstream version 2.9.5.upstream/2.9.5upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 25 insertions, 13 deletions

diff --git a/configure b/configure
index ead0f26..3c56b3a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for sssd 2.9.4.
+# Generated by GNU Autoconf 2.71 for sssd 2.9.5.
 #
 # Report bugs to <sssd-devel@lists.fedorahosted.org>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sssd'
 PACKAGE_TARNAME='sssd'
-PACKAGE_VERSION='2.9.4'
-PACKAGE_STRING='sssd 2.9.4'
+PACKAGE_VERSION='2.9.5'
+PACKAGE_STRING='sssd 2.9.5'
 PACKAGE_BUGREPORT='sssd-devel@lists.fedorahosted.org'
 PACKAGE_URL=''
 
@@ -815,6 +815,7 @@ SASL_CFLAGS
 SASL_LIBS
 SAMBA_UTIL_LIBS
 SAMBA_UTIL_CFLAGS
+IDMAP_SAMBA_LIBS
 NDR_KRB5PAC_LIBS
 NDR_KRB5PAC_CFLAGS
 SMBCLIENT_LIBS
@@ -1846,7 +1847,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sssd 2.9.4 to adapt to many kinds of systems.
+\`configure' configures sssd 2.9.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1917,7 +1918,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sssd 2.9.4:";;
+     short | recursive ) echo "Configuration of sssd 2.9.5:";;
    esac
   cat <<\_ACEOF
 
@@ -2402,7 +2403,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sssd configure 2.9.4
+sssd configure 2.9.5
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3059,7 +3060,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sssd $as_me 2.9.4, which was
+It was created by sssd $as_me 2.9.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -5628,7 +5629,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sssd'
- VERSION='2.9.4'
+ VERSION='2.9.5'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22684,6 +22685,7 @@ fi
 
 
 
+
 if test x"$with_samba" = xyes; then
 
 pkg_failed=no
@@ -23038,14 +23040,24 @@ fi
             as_fn_error $? "Illegal value -$with_smb_idmap_interface_version- for option --with-smb-idmap-interface-version" "$LINENO" 5
         fi
     else
-
+        sambalibdir="`$PKG_CONFIG --variable=libdir smbclient`"/samba
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Samba's idmap library" >&5
+printf %s "checking Samba's idmap library... " >&6; }
+        if test -f "${sambalibdir}/libidmap-private-samba.so"; then
+                IDMAP_SAMBA_LIBS=idmap-private-samba
+        elif test -f "${sambalibdir}/libidmap-samba4.so"; then
+                IDMAP_SAMBA_LIBS=idmap-samba4
+        else
+                as_fn_error $? "Cannot find private idmap-samba library" "$LINENO" 5
+        fi
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found: $IDMAP_SAMBA_LIBS" >&5
+printf "%s\n" "found: $IDMAP_SAMBA_LIBS" >&6; }
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Samba's idmap plugin interface version" >&5
 printf %s "checking Samba's idmap plugin interface version... " >&6; }
-        sambalibdir="`$PKG_CONFIG --variable=libdir smbclient`"/samba
         SAVE_CFLAGS=$CFLAGS
         SAVE_LIBS=$LIBS
         CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS $NDR_NBT_CFLAGS $NDR_KRB5PAC_CFLAGS"
-        LIBS="$LIBS -L${sambalibdir} -lidmap-samba4 -Wl,-rpath ${sambalibdir}"
+        LIBS="$LIBS -L${sambalibdir} -l${IDMAP_SAMBA_LIBS} -Wl,-rpath ${sambalibdir}"
         if test "$cross_compiling" = yes
 then :
   { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -31403,7 +31415,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sssd $as_me 2.9.4, which was
+This file was extended by sssd $as_me 2.9.5, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31471,7 +31483,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-sssd config.status 2.9.4
+sssd config.status 2.9.5
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"