From 8fd3cc84eb7675698f36d4f0a847bc39872b2106 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 1 Jan 2020 19:15:59 +1100 Subject: [PATCH] kdc: link test_token_validator against libgssapi The Negotiate token validation plugin links against libgssapi, but on macOS the dynamic linker cannot find it before Heimdal is installed. This causes tests to fail. Although test_token_validator itself does not require libgsaspi, link against it so that the test can proceed. --- kdc/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kdc/Makefile.am b/kdc/Makefile.am index a107a9e36..9c366fa1a 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -69,7 +69,7 @@ cjwt_token_validator_la_LDFLAGS = -module $(CJSON_LIBS) $(CJWT_LIBS) endif negotiate_token_validator_la_SOURCES = negotiate_token_validator.c -negotiate_token_validator_la_LDFLAGS = -module $(top_builddir)/lib/gssapi/libgssapi.la +negotiate_token_validator_la_LDFLAGS = -module $(LIB_gssapi) # CSR Authorizer plugins (for kdc/kx509 and bx509d) simple_csr_authorizer_la_SOURCES = simple_csr_authorizer.c simple_csr_authorizer_la_LDFLAGS = -module @@ -194,7 +194,7 @@ digest_service_LDADD = \ $(LDADD) $(LIB_pidfile) kdc_replay_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) kdc_tester_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase) -test_token_validator_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase) +test_token_validator_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase) $(LIB_gssapi) test_csr_authorizer_LDADD = libkdc.la $(top_builddir)/lib/hx509/libhx509.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase) test_kdc_ca_LDADD = libkdc.la $(top_builddir)/lib/hx509/libhx509.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase)