From 4d80d78b40c52bb3bb90bf4e039cc1b41bb0fa7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kou=C5=99il?= Date: Mon, 23 Aug 2004 14:55:49 +0000 Subject: [PATCH] Removed all calls to edg_wlc_SSLInitialization() and edg_wlc_SSLLockingInit() which aren't needed for GSSAPI. Makefile adapted accordingly to remove links to libglite_wmsutils_tls_ssl_helpers. --- org.glite.lb.client/Makefile | 6 ++---- org.glite.lb.client/src/dump.c | 3 --- org.glite.lb.client/src/load.c | 2 -- org.glite.lb.client/src/logevent.c.T | 2 -- org.glite.lb.client/src/purge.c | 2 -- org.glite.lb.logger/Makefile | 9 +++------ org.glite.lb.logger/src/interlogd.c | 13 ------------- org.glite.lb.logger/src/logd.c | 7 ------- org.glite.lb.server/Makefile | 7 ++----- org.glite.lb.server/src/bkserverd.c | 2 -- 10 files changed, 7 insertions(+), 46 deletions(-) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 165b55f..ae3cc23 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -37,8 +37,6 @@ CFLAGS:=${DEBUG} \ CXXFLAGS:=${CFLAGS} -HELPERS:=-L${glite_location}/lib -lglite_wmsutils_tls_ssl_helpers - GLOBUS_LIBS:=-L${globus_prefix}/lib \ -lglobus_common_${nothrflavour} \ -lglobus_gssapi_gsi_${nothrflavour} \ @@ -87,10 +85,10 @@ THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la TOOLS:=dump load purge ${LIB}: ${LIBOBJS} - ${LINK} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour} ${HELPERS} + ${LINK} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour} ${THRLIB}: ${LIBTHROBJS} - ${LINK} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour} ${HELPERS} + ${LINK} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour} ${PLUSLIB}: ${PLUSOBJS} ${LINK} -o $@ ${PLUSLOBJS} -rpath ${glite_location}/lib ${LIB} diff --git a/org.glite.lb.client/src/dump.c b/org.glite.lb.client/src/dump.c index 3575036..a75f75b 100644 --- a/org.glite.lb.client/src/dump.c +++ b/org.glite.lb.client/src/dump.c @@ -18,7 +18,6 @@ #include "glite/lb/ulm_parse.h" #include "glite/lb/xml_parse.h" #include "glite/lb/mini_http.h" -#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h" #define dprintf(x) { if (debug) printf x; } @@ -97,8 +96,6 @@ int main(int argc,char *argv[]) dprintf(("yes.\n")); } - edg_wlc_SSLInitialization(); - /* check request */ if (debug) { printf("Dump request:\n"); diff --git a/org.glite.lb.client/src/load.c b/org.glite.lb.client/src/load.c index 79086b1..97522b0 100644 --- a/org.glite.lb.client/src/load.c +++ b/org.glite.lb.client/src/load.c @@ -92,8 +92,6 @@ int main(int argc,char *argv[]) dprintf(("yes.\n")); } - edg_wlc_SSLInitialization(); - /* initialize context */ edg_wll_InitContext(&ctx); if ( server ) diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T index fc6e844..c6a1fc1 100644 --- a/org.glite.lb.client/src/logevent.c.T +++ b/org.glite.lb.client/src/logevent.c.T @@ -124,8 +124,6 @@ int main(int argc, char *argv[]) exit(1); } - edg_wlc_SSLInitialization(); - edg_wll_InitContext(&ctx); /* log the event - priority/normal */ diff --git a/org.glite.lb.client/src/purge.c b/org.glite.lb.client/src/purge.c index 3eff59b..f06ebed 100644 --- a/org.glite.lb.client/src/purge.c +++ b/org.glite.lb.client/src/purge.c @@ -170,8 +170,6 @@ int main(int argc,char *argv[]) dprintf(("yes.\n")); } - edg_wlc_SSLInitialization(); - /* initialize context */ edg_wll_InitContext(&ctx); diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 92c71a4..bbbb75a 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -50,9 +50,6 @@ GLOBUS_THRLIBS:= -L${globus_prefix}/lib \ EXT_LIBS:= -L${ares_prefix}/lib -lares \ -L${expat_prefix}/lib -lexpat -HELPERS:=-lglite_wmsutils_tls_ssl_helpers -PHELPERS:=-lglite_wmsutils_tls_ssl_pthr_helpers - COMMON_LIB:=-lglite_lb_common LOGD_OBJS:= logd_proto.o logd.o @@ -65,15 +62,15 @@ INTERLOG_OBJS:=il_error.o input_queue_socket.o \ INTERLOG_NOBJS:=${INTERLOG_OBJS:.o=.no} glite_lb_logd: ${LOGD_OBJS} - ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${HELPERS} ${EXT_LIBS} ${GLOBUS_LIBS} + ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS} glite_lb_interlogd: ${INTERLOG_OBJS} ${LINK} -o $@ ${INTERLOG_OBJS} \ - ${COMMON_LIB}_${thrflavour} ${HELPERS} ${PHELPERS} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread + ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread glite_lb_notif_interlogd: ${INTERLOG_NOBJS} ${LINK} -o $@ ${INTERLOG_NOBJS} \ - ${COMMON_LIB}_${thrflavour} ${HELPERS} ${PHELPERS} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread + ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread default: all diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c index 1603668..51c65f5 100644 --- a/org.glite.lb.logger/src/interlogd.c +++ b/org.glite.lb.logger/src/interlogd.c @@ -222,13 +222,6 @@ main (int argc, char **argv) if (CAcert_dir) setenv("X509_CERT_DIR", CAcert_dir, 1); - /* XXX DK: still needed? */ - il_log(LOG_INFO, "Initializing SSL...\n"); - if(edg_wlc_SSLInitialization() < 0) { - il_log(LOG_CRIT, "Failed to initialize SSL. Exiting.\n"); - exit(EXIT_FAILURE); - } - ret = edg_wll_gss_acquire_cred_gsi(cert_file, &cred_handle, NULL, &gss_stat); if (ret) { char *gss_err = NULL; @@ -256,12 +249,6 @@ main (int argc, char **argv) exit(EXIT_FAILURE); } - /* XXX DK: needed? */ - if (edg_wlc_SSLLockingInit() != 0) { - il_log(LOG_CRIT, "Failed to initialize SSL locking. Exiting.\n"); - exit(EXIT_FAILURE); - } - /* find all unsent events waiting in files */ { pthread_t rid; diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c index ae42afe..ad3fbd4 100644 --- a/org.glite.lb.logger/src/logd.c +++ b/org.glite.lb.logger/src/logd.c @@ -340,13 +340,6 @@ Copyright (c) 2002 CERN, INFN and CESNET on behalf of the EU DataGrid.\n"); if (mysignal(SIGTERM, handle_signal) == SIG_ERR) { perror("signal"); exit(1); } if (mysignal(SIGCHLD, handle_signal) == SIG_ERR) { perror("signal"); exit(1); } - /* SSL init */ - edg_wll_ll_log(LOG_INFO,"Initializing SSL:\n"); - if (edg_wlc_SSLInitialization() != 0) { - edg_wll_ll_log(LOG_CRIT,"Failed to initialize SSL. Exiting.\n"); - exit(1); - } - /* XXX DK: support noAuth */ ret = edg_wll_gss_acquire_cred_gsi(cert_file, &cred, &my_subject_name, &gss_stat); diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index cf0c7eb..23e6061 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -65,9 +65,6 @@ EXT_LIBS:= -L${ares_prefix}/lib -lares \ COMMON_LIB:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour} -HELPERS:= -L${stagedir}/lib -lglite_wmsutils_tls_ssl_helpers - - SERVER_OBJS:= bkserverd.o get_events.o index.o jobstat.o jobstat_supp.o \ write2rgma.o lbs_db.o lb_html.o lb_http.o lb_proto.o lb_xml_parse.o \ lb_xml_parse_V21.o \ @@ -80,10 +77,10 @@ INDEX_OBJS:= index.o index_parse.o jobstat_supp.o lbs_db.o openserver.o \ lb_authz.o store.o bkindex.o glite_lb_bkserverd: ${SERVER_OBJS} - ${LINK} -o $@ ${SERVER_OBJS} ${COMMON_LIB} ${HELPERS} ${EXT_LIBS} + ${LINK} -o $@ ${SERVER_OBJS} ${COMMON_LIB} ${EXT_LIBS} glite_lb_bkindex: ${INDEX_OBJS} - ${LINK} -o $@ ${INDEX_OBJS} ${COMMON_LIB} ${HELPERS} ${EXT_LIBS} + ${LINK} -o $@ ${INDEX_OBJS} ${COMMON_LIB} ${EXT_LIBS} default all: compile diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index fa36b4a..4d8f10b 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -660,8 +660,6 @@ int main(int argc,char *argv[]) return 1; } - dprintf(("Initializing SSL ...\n")); - edg_wlc_SSLInitialization(); if (!cert || !key) fprintf(stderr,"%s: key or certificate file not specified - unable to watch them for changes!\n",argv[0]); if (cadir) setenv("X509_CERT_DIR",cadir,1); -- 1.8.2.3