From 2ebb9c92a0950db8303970b1333177b08c2ba416 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20=C5=A0kr=C3=A1bal?= Date: Tue, 15 Feb 2005 10:19:58 +0000 Subject: [PATCH] - make it to use glite_security_gss* library --- org.glite.lb.client/Makefile | 16 ++++++++++++---- org.glite.lb.client/examples/notify.c | 2 +- org.glite.lb.client/src/connection.c | 2 +- org.glite.lb.client/src/notification.c | 3 +-- org.glite.lb.client/src/prod_proto.c | 2 +- org.glite.lb.client/src/prod_proto.h | 2 +- org.glite.lb.client/src/producer.c | 2 +- org.glite.lb.logger/Makefile | 13 +++++++++---- org.glite.lb.logger/src/il_error.c | 2 +- org.glite.lb.logger/src/interlogd.c | 2 +- org.glite.lb.logger/src/interlogd.h | 2 +- org.glite.lb.logger/src/logd.c | 2 +- org.glite.lb.logger/src/logd_proto.h | 2 +- org.glite.lb.logger/test/il_test.cpp | 2 +- 14 files changed, 33 insertions(+), 21 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 4c7350e..4aaccb3 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -147,16 +147,24 @@ MAN = $(MAN_GZ:.gz=) version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` ${LIB}: ${LIBOBJS} - ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour} + ${LINK} ${version_info} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib \ + -lglite_lb_common_${nothrflavour} \ + -lglite_security_gss_${nothrflavour} ${THRLIB}: ${LIBTHROBJS} - ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour} + ${LINK} ${version_info} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib \ + -lglite_lb_common_${thrflavour} \ + -lglite_security_gss_${thrflavour} ${FAKELIB}: ${FAKELIBOBJS} - ${LINK} ${version_info} -o $@ ${FAKELIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour} + ${LINK} ${version_info} -o $@ ${FAKELIBLOBJS} -rpath ${glite_location}/lib \ + -lglite_lb_common_${nothrflavour} \ + -lglite_security_gss_${nothrflavour} ${FAKETHRLIB}: ${FAKELIBTHROBJS} - ${LINK} ${version_info} -o $@ ${FAKELIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour} + ${LINK} ${version_info} -o $@ ${FAKELIBTHRLOBJS} -rpath ${glite_location}/lib \ + -lglite_lb_common_${thrflavour} \ + -lglite_security_gss_${thrflavour} ${PLUSLIB}: ${PLUSOBJS} ${LINK} ${version_info} -o $@ ${PLUSLOBJS} -rpath ${glite_location}/lib ${LIB} diff --git a/org.glite.lb.client/examples/notify.c b/org.glite.lb.client/examples/notify.c index 7db0f73..f21727b 100644 --- a/org.glite.lb.client/examples/notify.c +++ b/org.glite.lb.client/examples/notify.c @@ -4,8 +4,8 @@ #include #include +#include "glite/security/glite_gss.h" #include "glite/lb/context.h" -#include "glite/lb/lb_gss.h" #include "glite/lb/notification.h" diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c index 173ef47..76ffaf5 100644 --- a/org.glite.lb.client/src/connection.c +++ b/org.glite.lb.client/src/connection.c @@ -9,9 +9,9 @@ #include #include +#include "glite/security/glite_gss.h" #include "glite/lb/consumer.h" #include "glite/lb/context-int.h" -#include "glite/lb/lb_gss.h" #include "glite/lb/mini_http.h" diff --git a/org.glite.lb.client/src/notification.c b/org.glite.lb.client/src/notification.c index 0e4f6cf..85cc3f6 100644 --- a/org.glite.lb.client/src/notification.c +++ b/org.glite.lb.client/src/notification.c @@ -8,7 +8,7 @@ #include #include - +#include "glite/security/glite_gss.h" #include "glite/lb/notification.h" #include "glite/lb/events.h" #include "glite/lb/log_proto.h" @@ -18,7 +18,6 @@ #include "glite/lb/events_parse.h" #include "glite/lb/il_msg.h" #include "glite/lb/escape.h" -#include "glite/lb/lb_gss.h" #include "connection.h" diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c index 55be913..29a122e 100644 --- a/org.glite.lb.client/src/prod_proto.c +++ b/org.glite.lb.client/src/prod_proto.c @@ -1,9 +1,9 @@ #ident "$Header$" #include "prod_proto.h" + #include "glite/lb/producer.h" #include "glite/lb/escape.h" -#include "glite/lb/lb_gss.h" #include "glite/lb/lb_plain_io.h" #include "glite/lb/il_msg.h" #include "glite/lb/il_string.h" diff --git a/org.glite.lb.client/src/prod_proto.h b/org.glite.lb.client/src/prod_proto.h index 9b1561c..c5d5887 100644 --- a/org.glite.lb.client/src/prod_proto.h +++ b/org.glite.lb.client/src/prod_proto.h @@ -14,9 +14,9 @@ extern "C" { #endif +#include "glite/security/glite_gss.h" #include "glite/lb/log_proto.h" #include "glite/lb/context-int.h" -#include "glite/lb/lb_gss.h" int edg_wll_log_proto_client(edg_wll_Context context, edg_wll_GssConnection *con, edg_wll_LogLine logline); int edg_wll_log_proto_client_direct(edg_wll_Context context, edg_wll_GssConnection *con, edg_wll_LogLine logline); diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c index 2548209..d79500f 100644 --- a/org.glite.lb.client/src/producer.c +++ b/org.glite.lb.client/src/producer.c @@ -15,12 +15,12 @@ #include #include "glite/wmsutils/jobid/strmd5.h" +#include "glite/security/glite_gss.h" #include "glite/lb/consumer.h" #include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "glite/lb/ulm_parse.h" #include "glite/lb/trio.h" -#include "glite/lb/lb_gss.h" #include "glite/lb/lb_plain_io.h" #include "glite/lb/escape.h" diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index eeed980..5f9cb69 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -60,6 +60,7 @@ EXPAT_LIBS:=${EXPAT_LIBS} -lexpat EXT_LIBS:= -L${ares_prefix}/lib -lares ${EXPAT_LIBS} COMMON_LIB:=-lglite_lb_common +GLITE_GSS_LIB:=-lglite_security_gss TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit TEST_INC:=-I${cppunit_prefix}/include @@ -91,15 +92,19 @@ INTERLOG_TEST_OBJS:= \ il_test.o glite_lb_logd: ${LOGD_OBJS} - ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS} + ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS} glite_lb_interlogd: ${INTERLOG_OBJS} ${LINK} -o $@ ${INTERLOG_OBJS} \ - ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread + ${COMMON_LIB}_${thrflavour} \ + ${GLITE_GSS_LIB}_${nothrflavour} \ + ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread glite_lb_notif_interlogd: ${INTERLOG_NOBJS} ${LINK} -o $@ ${INTERLOG_NOBJS} \ - ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread + ${COMMON_LIB}_${thrflavour} \ + ${GLITE_GSS_LIB}_${nothrflavour} \ + ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread default: all @@ -120,7 +125,7 @@ check.ll: -echo commented out -- fix needed check.il: ${INTERLOG_TEST_OBJS} - ${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} ${TEST_LIBS} -lpthread $+ + ${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${GLITE_GSS_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} ${TEST_LIBS} -lpthread $+ dist: distsrc distbin diff --git a/org.glite.lb.logger/src/il_error.c b/org.glite.lb.logger/src/il_error.c index 6a9083a..95bee1b 100644 --- a/org.glite.lb.logger/src/il_error.c +++ b/org.glite.lb.logger/src/il_error.c @@ -11,7 +11,7 @@ /* XXX DK: */ #include // SSL header file -#include "glite/lb/lb_gss.h" +#include "glite/security/glite_gss.h" #include "il_error.h" diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c index dba2f0d..d2d53b3 100644 --- a/org.glite.lb.logger/src/interlogd.c +++ b/org.glite.lb.logger/src/interlogd.c @@ -13,7 +13,7 @@ #include "interlogd.h" #include "glite/lb/consumer.h" -#include "glite/lb/lb_gss.h" +#include "glite/security/glite_gss.h" #define EXIT_FAILURE 1 #if defined(IL_NOTIFICATIONS) diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h index 74fc469..64c6889 100644 --- a/org.glite.lb.logger/src/interlogd.h +++ b/org.glite.lb.logger/src/interlogd.h @@ -4,7 +4,7 @@ #ident "$Header$" #include "il_error.h" -#include "glite/lb/lb_gss.h" +#include "glite/security/glite_gss.h" #include #include diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c index f291a81..406a410 100644 --- a/org.glite.lb.logger/src/logd.c +++ b/org.glite.lb.logger/src/logd.c @@ -15,7 +15,7 @@ #include "logd_proto.h" #include "glite/lb/consumer.h" -#include "glite/lb/lb_gss.h" +#include "glite/security/glite_gss.h" static const char rcsid[] = "@(#)$Id$"; static int verbose = 0; diff --git a/org.glite.lb.logger/src/logd_proto.h b/org.glite.lb.logger/src/logd_proto.h index b8e167e..365de51 100644 --- a/org.glite.lb.logger/src/logd_proto.h +++ b/org.glite.lb.logger/src/logd_proto.h @@ -17,7 +17,7 @@ extern "C" { #include #include "glite/lb/log_proto.h" -#include "glite/lb/lb_gss.h" +#include "glite/security/glite_gss.h" int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefix, int noipc, int noparse); int edg_wll_log_proto_server_failure(int code, edg_wll_GssStatus *gss_code, const char *text); diff --git a/org.glite.lb.logger/test/il_test.cpp b/org.glite.lb.logger/test/il_test.cpp index 1bafb04..cd97a73 100644 --- a/org.glite.lb.logger/test/il_test.cpp +++ b/org.glite.lb.logger/test/il_test.cpp @@ -5,9 +5,9 @@ extern "C" { #include #include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h" #include "glite/wmsutils/tls/ssl_helpers/ssl_pthreads.h" +#include "glite/security/glite_gss.h" #include "interlogd.h" #include "glite/lb/consumer.h" -#include "glite/lb/lb_gss.h" } #if defined(IL_NOTIFICATIONS) -- 1.8.2.3