diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2015-01-12 13:36:36 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2015-01-19 10:21:48 +0100 |
| commit | d57efb74bb6ad91b029fffff39ed4e482c41f8ba (patch) | |
| tree | 761e445d321f7c85ad7a408dc4a0783f97714515 /daemons/configure.ac | |
| parent | 9af8fa9dd59970a27630545b1fec32de5e100c51 (diff) | |
| download | freeipa-d57efb74bb6ad91b029fffff39ed4e482c41f8ba.tar.gz freeipa-d57efb74bb6ad91b029fffff39ed4e482c41f8ba.tar.xz freeipa-d57efb74bb6ad91b029fffff39ed4e482c41f8ba.zip | |
Support Samba PASSDB 0.2.0 aka interface version 24
1. Samba project renamed libpdb to libsamba-passdb
https://bugzilla.samba.org/show_bug.cgi?id=10355
2. With interface version 24, Samba removed uid_to_sid()/gid_to_sid()
from the PASSDB interface and united them as id_to_sid().
Make sure FreeIPA ipa_sam code supports new and old versions of
the PASSDB API.
https://fedorahosted.org/freeipa/ticket/4778
Reviewed-By: Sumit Bose <sbose@redhat.com>
Diffstat (limited to 'daemons/configure.ac')
| -rw-r--r-- | daemons/configure.ac | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/daemons/configure.ac b/daemons/configure.ac index e81aa60e3..a62897e96 100644 --- a/daemons/configure.ac +++ b/daemons/configure.ac @@ -170,12 +170,24 @@ PKG_CHECK_MODULES([SAMBAUTIL], [samba-util]) SAMBA40EXTRA_LIBPATH="-L`$PKG_CONFIG --variable=libdir samba-util`/samba -Wl,-rpath=`$PKG_CONFIG --variable=libdir samba-util`/samba" AC_SUBST(SAMBA40EXTRA_LIBPATH) -AC_CHECK_LIB([pdb], +LIBPDB_NAME="" +AC_CHECK_LIB([samba-passdb], [make_pdb_method], - [HAVE_LIBPDB=1], - [AC_MSG_ERROR([libpdb does not have make_pdb_method])], + [LIBPDB_NAME="samba-passdb"; HAVE_LIBPDB=1], + [LIBPDB_NAME="pdb"], [$SAMBA40EXTRA_LIBPATH]) -AC_CHECK_LIB([pdb],[pdb_enum_upn_suffixes], + +if test "x$LIB_PDB_NAME" = "xpdb" ; then + AC_CHECK_LIB([$LIBPDB_NAME], + [make_pdb_method], + [HAVE_LIBPDB=1], + [AC_MSG_ERROR([Neither libpdb nor libsamba-passdb does have make_pdb_method])], + [$SAMBA40EXTRA_LIBPATH]) +fi + +AC_SUBST(LIBPDB_NAME) + +AC_CHECK_LIB([$LIBPDB_NAME],[pdb_enum_upn_suffixes], [AC_DEFINE([HAVE_PDB_ENUM_UPN_SUFFIXES], [1], [Ability to enumerate UPN suffixes])], [AC_MSG_WARN([libpdb does not have pdb_enum_upn_suffixes, no support for realm domains in ipasam])], [$SAMBA40EXTRA_LIBPATH]) |