From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Thu, 29 Apr 2010 17:28:45 +0000 (+0000)
Subject: Build libs/tests with libencrypted_challenge.a
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b0d3fe73db8c23ed2a390ea16316a09712d7519;p=thirdparty%2Fkrb5.git

Build libs/tests with libencrypted_challenge.a

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/plugins@23949 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 49e4a35a48..3ea36c1e57 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -6,17 +6,20 @@ BUILDTOP=$(REL)..
 #                define USE_RCACHE)
 # These are now set in configure.in.
 DEFINES = # -DNOCACHE
+PLUGIN_PA = ../plugins/pa/libplugin_pa.a
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 KDB5_LIB_DEPS=$(DL_LIB) $(THREAD_LINKOPTS)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
 
+
+
 all:: krb5kdc rtest
 
 # DEFINES = -DBACKWARD_COMPAT $(KRB4DEF)
 
-LOCALINCLUDES = -I.
+LOCALINCLUDES = -I. -I../plugins/pa/encrypted_challenge -I../plugin_core -I../plugins/pa
 SRCS= \
 	kdc5_err.c \
 	$(srcdir)/dispatch.c \
@@ -25,6 +28,7 @@ SRCS= \
 	$(srcdir)/fast_util.c \
 	$(srcdir)/kdc_util.c \
 	$(srcdir)/kdc_preauth.c \
+	$(srcdir)/enc_challenge.c \
 	$(srcdir)/main.c \
 	$(srcdir)/policy.c \
 	$(srcdir)/extern.c \
@@ -39,6 +43,7 @@ OBJS= \
 	fast_util.o \
 	kdc_util.o \
 	kdc_preauth.o \
+	enc_challenge.o \
 	main.o \
 	policy.o \
 	extern.o \
@@ -59,7 +64,7 @@ kdc5_err.h: kdc5_err.et
 kdc5_err.o: kdc5_err.h
 
 krb5kdc: $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(APPUTILS_DEPLIB)
-	$(CC_LINK) -o krb5kdc $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
+	$(CC_LINK) -o krb5kdc $(OBJS) $(APPUTILS_LIB) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)  $(PLUGIN_PA)
 
 rtest: $(RT_OBJS) $(KDB5_DEPLIBS) $(KADM_COMM_DEPLIBS) $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o rtest $(RT_OBJS) $(KDB5_LIBS) $(KADM_COMM_LIBS) $(KRB5_BASE_LIBS)
diff --git a/src/kdc/deps b/src/kdc/deps
index 6360905652..2b5a3f9fdf 100644
--- a/src/kdc/deps
+++ b/src/kdc/deps
@@ -77,6 +77,20 @@ $(OUTPRE)kdc_preauth.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(top_srcdir)/include/net-server.h $(top_srcdir)/include/port-sockets.h \
   $(top_srcdir)/include/socket-utils.h extern.h kdc_preauth.c \
   kdc_util.h
+$(OUTPRE)enc_challenge.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+  $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/adm_proto.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-gmt_mktime.h \
+  $(top_srcdir)/include/k5-int-pkinit.h $(top_srcdir)/include/k5-int.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-plugin.h \
+  $(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/kdb.h \
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/kdc/enc_challenge.h  $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/net-server.h $(top_srcdir)/include/port-sockets.h \
+  $(top_srcdir)/plugin_core/plugin_manager.h $(top_srcdir)/plugins/pa/plugin_pa.h \
+  $(top_srcdir)/include/socket-utils.h extern.h enc_challenge.c \
+  kdc_util.h
 $(OUTPRE)main.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/adm.h \
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in
index ee09ea4b5f..c8d910e2a2 100644
--- a/src/lib/crypto/crypto_tests/Makefile.in
+++ b/src/lib/crypto/crypto_tests/Makefile.in
@@ -14,8 +14,8 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
-PLUGINS_LIBS = \
-	$(srcdir)/../../libplugin_impl.a $(srcdir)/../../libplugin_yarrow.a
+PLUGINS_LIBS = -lkrb5 \
+	$(srcdir)/../../libplugin_impl.a $(srcdir)/../../libplugin_yarrow.a $(srcdir)/../../libencrypted_challenge.a
 
 EXTRADEPSRCS=\
 	$(srcdir)/t_nfold.c	\