diff options
| author | Simo Sorce <ssorce@redhat.com> | 2010-12-03 15:02:29 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2010-12-06 12:23:09 -0500 |
| commit | 37f48c0019c64f20bfc24b021442b643eaf86aab (patch) | |
| tree | 416ce19e54ddc2e1efa88beac4978124676c7d85 /daemons/ipa-slapi-plugins/ipa-pwd-extop | |
| parent | fee9fae941bd747d7f2f22f2b95626107b11049f (diff) | |
| download | freeipa-37f48c0019c64f20bfc24b021442b643eaf86aab.tar.gz freeipa-37f48c0019c64f20bfc24b021442b643eaf86aab.tar.xz freeipa-37f48c0019c64f20bfc24b021442b643eaf86aab.zip | |
Make use of mozldap vs openldap for plugins selectable
Diffstat (limited to 'daemons/ipa-slapi-plugins/ipa-pwd-extop')
| -rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am | 4 | ||||
| -rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h | 2 | ||||
| -rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am index 41d9f237..1daf942d 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/Makefile.am @@ -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) diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h index bc521071..28833eaf 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h @@ -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> diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c index 31ecb1e4..acb5cdbc 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_common.c @@ -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; } |