dovecot-1.2: Fixed --with-ldap=plugin and --with-gssapi=plugin
dovecot at dovecot.org
dovecot at dovecot.org
Fri Mar 27 00:36:45 EET 2009
details: http://hg.dovecot.org/dovecot-1.2/rev/643a96aec996
changeset: 8872:643a96aec996
user: Timo Sirainen <tss at iki.fi>
date: Thu Mar 26 18:36:36 2009 -0400
description:
Fixed --with-ldap=plugin and --with-gssapi=plugin
diffstat:
5 files changed, 8 insertions(+), 16 deletions(-)
src/auth/Makefile.am | 16 ++++------------
src/auth/db-ldap.c | 2 +-
src/auth/mech-gssapi.c | 2 +-
src/auth/passdb-ldap.c | 2 +-
src/auth/userdb-ldap.c | 2 +-
diffs (101 lines):
diff -r 7c21256e3598 -r 643a96aec996 src/auth/Makefile.am
--- a/src/auth/Makefile.am Thu Mar 26 18:17:09 2009 -0400
+++ b/src/auth/Makefile.am Thu Mar 26 18:36:36 2009 -0400
@@ -48,14 +48,6 @@ dovecot_auth_LDADD = \
ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c
-if ! LDAP_PLUGIN
-builtin_ldap_sources = $(ldap_sources)
-endif
-
-if ! GSSAPI_PLUGIN
-builtin_gssapi_sources = mech-gssapi.c
-endif
-
dovecot_auth_SOURCES = \
auth.c \
auth-cache.c \
@@ -77,6 +69,7 @@ dovecot_auth_SOURCES = \
mech-login.c \
mech-cram-md5.c \
mech-digest-md5.c \
+ mech-gssapi.c \
mech-ntlm.c \
mech-otp.c \
mech-skey.c \
@@ -107,8 +100,7 @@ dovecot_auth_SOURCES = \
userdb-static.c \
userdb-vpopmail.c \
userdb-sql.c \
- $(builtin_gssapi_sources) \
- $(builtin_ldap_sources)
+ $(ldap_sources)
headers = \
auth.h \
@@ -144,14 +136,14 @@ if GSSAPI_PLUGIN
if GSSAPI_PLUGIN
libmech_gssapi_la_LDFLAGS = -module -avoid-version
libmech_gssapi_la_LIBADD = $(KRB5_LIBS)
-libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS)
+libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -DPLUGIN_BUILD
libmech_gssapi_la_SOURCES = mech-gssapi.c
endif
if LDAP_PLUGIN
libauthdb_ldap_la_LDFLAGS = -module -avoid-version
libauthdb_ldap_la_LIBADD = $(LDAP_LIBS)
-libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS)
+libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD
libauthdb_ldap_la_SOURCES = $(ldap_sources)
endif
diff -r 7c21256e3598 -r 643a96aec996 src/auth/db-ldap.c
--- a/src/auth/db-ldap.c Thu Mar 26 18:17:09 2009 -0400
+++ b/src/auth/db-ldap.c Thu Mar 26 18:36:36 2009 -0400
@@ -2,7 +2,7 @@
#include "common.h"
-#if defined(PASSDB_LDAP) || defined(USERDB_LDAP)
+#if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)
#include "network.h"
#include "ioloop.h"
diff -r 7c21256e3598 -r 643a96aec996 src/auth/mech-gssapi.c
--- a/src/auth/mech-gssapi.c Thu Mar 26 18:17:09 2009 -0400
+++ b/src/auth/mech-gssapi.c Thu Mar 26 18:36:36 2009 -0400
@@ -23,7 +23,7 @@
#include <stdlib.h>
-#ifdef HAVE_GSSAPI
+#if defined(BUILTIN_GSSAPI) || defined(PLUGIN_BUILD)
#ifndef HAVE___GSS_USEROK
# define USE_KRB5_USEROK
diff -r 7c21256e3598 -r 643a96aec996 src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c Thu Mar 26 18:17:09 2009 -0400
+++ b/src/auth/passdb-ldap.c Thu Mar 26 18:36:36 2009 -0400
@@ -3,7 +3,7 @@
#include "common.h"
#include "passdb.h"
-#ifdef PASSDB_LDAP
+#if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
#include "ioloop.h"
#include "hash.h"
diff -r 7c21256e3598 -r 643a96aec996 src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c Thu Mar 26 18:17:09 2009 -0400
+++ b/src/auth/userdb-ldap.c Thu Mar 26 18:36:36 2009 -0400
@@ -3,7 +3,7 @@
#include "common.h"
#include "userdb.h"
-#ifdef USERDB_LDAP
+#if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD))
#include "hash.h"
#include "str.h"
More information about the dovecot-cvs
mailing list