svn rev #23949: branches/plugins/src/ kdc/ lib/crypto/crypto_tests/

[tsitkova@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23949
Commit By: tsitkova
Log Message:
Build libs/tests with libencrypted_challenge.a



Changed Files:
U   branches/plugins/src/kdc/Makefile.in
U   branches/plugins/src/kdc/deps
U   branches/plugins/src/lib/crypto/crypto_tests/Makefile.in
Modified: branches/plugins/src/kdc/Makefile.in
===================================================================
--- branches/plugins/src/kdc/Makefile.in	2010-04-27 09:36:28 UTC (rev 23948)
+++ branches/plugins/src/kdc/Makefile.in	2010-04-29 17:28:45 UTC (rev 23949)
@@ -6,17 +6,20 @@
 #                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 @@
 	$(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 @@
 	fast_util.o \
 	kdc_util.o \
 	kdc_preauth.o \
+	enc_challenge.o \
 	main.o \
 	policy.o \
 	extern.o \
@@ -59,7 +64,7 @@
 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)

Modified: branches/plugins/src/kdc/deps
===================================================================
--- branches/plugins/src/kdc/deps	2010-04-27 09:36:28 UTC (rev 23948)
+++ branches/plugins/src/kdc/deps	2010-04-29 17:28:45 UTC (rev 23949)
@@ -77,6 +77,20 @@
   $(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 \

Modified: branches/plugins/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- branches/plugins/src/lib/crypto/crypto_tests/Makefile.in	2010-04-27 09:36:28 UTC (rev 23948)
+++ branches/plugins/src/lib/crypto/crypto_tests/Makefile.in	2010-04-29 17:28:45 UTC (rev 23949)
@@ -14,8 +14,8 @@
 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	\