IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-20 11:48:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make use of mozldap vs openldap for plugins selectable

Browse Source
This commit is contained in:
Simo Sorce 2010-12-03 15:02:29 -05:00
parent fee9fae941
commit 37f48c0019
11 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemons/configure.ac
View File

@ -137,11 +137,9 @@ fi
AC_SUBST(KRB5_LIBS)
dnl ---------------------------------------------------------------------------
dnl - Check for Mozilla LDAP *and* OpenLDAP SDK
dnl - Check for Mozilla LDAP and OpenLDAP SDK
dnl ---------------------------------------------------------------------------
dnl The mozldap libraries are always needed because ipa-slapi-plugins/dna/
dnl will not build against OpenLDAP.
SAVE_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$NSPR4 $NSS3"
AC_CHECK_HEADER(svrcore.h)
@ -193,6 +191,21 @@ AC_SUBST(OPENLDAP_LIBS)
OPENLDAP_CFLAGS="${OPENLDAP_CFLAGS} -DWITH_OPENLDAP"
AC_SUBST(OPENLDAP_CFLAGS)
AC_ARG_WITH([openldap],
[AS_HELP_STRING([--with-openldap],
[compile plugins with openldap instead of mozldap])],
[], [])
if test "x$with_openldap" == xyes; then
LDAP_CFLAGS="${OPENLDAP_CFLAGS} $NSPR4 $NSS3 -DUSE_OPENLDAP"
LDAP_LIBS="${OPENLDAP_LIBS}"
else
LDAP_CFLAGS="${MOZLDAP_CFLAGS}"
LDAP_LIBS="${MOZLDAP_LIBS}"
fi
AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
dnl ---------------------------------------------------------------------------
dnl - Check for OpenSSL Crypto library
dnl ---------------------------------------------------------------------------
@ -312,7 +325,7 @@ echo "
source code location: ${srcdir}
compiler: ${CC}
cflags: ${CFLAGS}
LDAP libs: ${OPENLDAP_LIBS}
LDAP libs: ${LDAP_LIBS}
KRB5 libs: ${KRB5_LIBS}
OpenSSL libs: ${SSL_LIBS}
Maintainer mode: ${USE_MAINTAINER_MODE}

4
daemons/ipa-slapi-plugins/ipa-enrollment/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@ -29,7 +29,7 @@ libipa_enrollment_extop_la_SOURCES = \
libipa_enrollment_extop_la_LDFLAGS = -avoid-version
libipa_enrollment_extop_la_LIBADD = \
$(MOZLDAP_LIBS) \
$(LDAP_LIBS) \
$(NULL)
appdir = $(IPA_DATA_DIR)

4
daemons/ipa-slapi-plugins/ipa-modrdn/Makefile.am
View File

@ -13,7 +13,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@ -29,7 +29,7 @@ libipa_modrdn_la_SOURCES = \
libipa_modrdn_la_LDFLAGS = -avoid-version
libipa_modrdn_la_LIBADD = \
$(MOZLDAP_LIBS) \
$(LDAP_LIBS) \
$(NULL)
appdir = $(IPA_DATA_DIR)

4
daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am
View File

@ -15,7 +15,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \
$(SSL_CFLAGS) \
$(WARN_CFLAGS) \
@ -39,7 +39,7 @@ libipa_pwd_extop_la_LDFLAGS = -avoid-version
libipa_pwd_extop_la_LIBADD = \
$(KRB5_LIBS) \
$(SSL_LIBS) \
$(MOZLDAP_LIBS) \
$(LDAP_LIBS) \
$(NULL)
appdir = $(IPA_DATA_DIR)

2
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h
View File

@ -49,6 +49,8 @@
#include <unistd.h>
#include <stdbool.h>
#define LDAP_DEPRECATED 1
#include <prio.h>
#include <ssl.h>
#include <dirsrv/slapi-plugin.h>

4
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c
View File

@ -206,8 +206,8 @@ static struct ipapwd_krbcfg *ipapwd_getConfig(void)
goto free_and_error;
}
be = ber_init(bval);
if (!bval) {
be = ber_init(discard_const(bval));
if (!be) {
LOG_FATAL("ber_init() failed!\n");
goto free_and_error;
}

4
daemons/ipa-slapi-plugins/ipa-uuid/Makefile.am
View File

@ -13,7 +13,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@ -29,7 +29,7 @@ libipa_uuid_la_SOURCES = \
libipa_uuid_la_LDFLAGS = -avoid-version
libipa_uuid_la_LIBADD = \
$(MOZLDAP_LIBS) \
$(LDAP_LIBS) \
$(UUID_LIBS) \
$(NULL)

4
daemons/ipa-slapi-plugins/ipa-version/Makefile.am
View File

@ -14,7 +14,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(KRB5_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@ -31,7 +31,7 @@ libipa_repl_version_la_SOURCES = \
libipa_repl_version_la_LDFLAGS = -avoid-version
libipa_repl_version_la_LIBADD = \
$(MOZLDAP_LIBS) \
$(LDAP_LIBS) \
$(NULL)
appdir = $(IPA_DATA_DIR)

4
daemons/ipa-slapi-plugins/ipa-winsync/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(AM_CFLAGS) \
$(MOZLDAP_CFLAGS) \
$(LDAP_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)
@ -29,7 +29,7 @@ libipa_winsync_la_SOURCES = \
libipa_winsync_la_LDFLAGS = -avoid-version
#libipa_winsync_la_LIBADD = \
# $(MOZLDAP_LIBS) \
# $(LDAP_LIBS) \
# $(NULL)
appdir = $(IPA_DATA_DIR)

3
daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
View File

@ -41,6 +41,8 @@
# include <config.h>
#endif
#define LDAP_DEPRECATED 1
/*
* Windows Synchronization Plug-in for IPA
* This plugin allows IPA to intercept operations sent from
@ -60,6 +62,7 @@
#include "ipa-winsync.h"
#include <string.h>
#include <stdlib.h>
#include "plstr.h"
static void

4
ipa.spec.in
View File

@ -226,7 +226,11 @@ export CPPFLAGS="$CPPFLAGS %{optflags}"
make version-update
cd ipa-client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%if ! %{ONLY_CLIENT}
%if 0%{?fedora} >= 14
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd ..
%else
cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%endif
cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd ..
%endif