diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-06-28 14:07:07 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-06-28 14:07:07 +0000 |
| commit | bc359880c203d769e230e3285af2512d22fc62aa (patch) | |
| tree | 462450dc407c324baadc0526a3175129630aed9d /src/plugins/kdb | |
| parent | b3306310689d72dd1b6284150f70a068dfd98865 (diff) | |
| download | krb5-bc359880c203d769e230e3285af2512d22fc62aa.tar.gz krb5-bc359880c203d769e230e3285af2512d22fc62aa.tar.xz krb5-bc359880c203d769e230e3285af2512d22fc62aa.zip | |
Get static linking working again, mostly
Static linking (#6510) broke when lockout support was added because
the DB2 plugin became dependent on libkadm5srv_mit for XDR functions.
Also, static linking was extensively broken in combination with LDAP
support. Fix these problems.
Afer these fixes, the test suite fails in the FAST tests because
there's no static build support for dynamic preauth plugins, which
means there's no encrypted challenge. (And unlike the pkinit tests,
the test suite doesn't conditionalize on the presence of the encrypted
challenge plugin, because we always build it.) This will fix itself
if and when encrypted challenge becomes linked into the consumers, or
static build support is added for preauth plugins.
ticket: 6914
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24996 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins/kdb')
| -rw-r--r-- | src/plugins/kdb/ldap/Makefile.in | 4 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/Makefile.in | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in index 490c3ecfd3..dffb60f47e 100644 --- a/src/plugins/kdb/ldap/Makefile.in +++ b/src/plugins/kdb/ldap/Makefile.in @@ -7,7 +7,7 @@ PROG_RPATH=$(KRB5_LIBDIR) DEFS = MODULE_INSTALL_DIR = $(KRB5_DB_MODULE_DIR) -SUBDIRS= libkdb_ldap ldap_util +SUBDIRS= libkdb_ldap LOCALINCLUDES = -I../../../lib/kdb -I$(srcdir)/../../../lib/kdb \ -I$(srcdir)/libkdb_ldap @@ -29,8 +29,6 @@ SHLIB_EXPLIBS= -lkdb_ldap $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto -lkrb5suppo SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) -$(TOPLIBD)/libkdb_ldap$(SHLIBEXT): all-recurse - SRCS= $(srcdir)/ldap_exp.c STOBJLISTS=OBJS.ST diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in index cadc1bfe0f..2126df6167 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in +++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in @@ -29,7 +29,7 @@ SHLIB_EXPDEPS = \ $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ $(SUPPORT_DEPLIB) \ $(TOPLIBD)/libkrb5$(SHLIBEXT) -SHLIB_EXPLIBS= $(KADMSRV_LIBS) -lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) @LDAP_LIBS@ $(LIBS) +SHLIB_EXPLIBS= $(KADMSRV_LIBS) -lkrb5 -lk5crypto $(COM_ERR_LIB) $(SUPPORT_LIB) $(LDAP_LIBS) $(LIBS) SHLIB_DIRS=-L$(TOPLIBD) SHLIB_RDIRS=$(KRB5_LIBDIR) |