From 9c42635a526565333bc57e5e801febb1c785d111 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 22 Jun 2012 12:57:28 +0000 Subject: [PATCH] Disable the lcas module. --- org.glite.lb.server/Makefile | 13 ++++++++++--- org.glite.lb.server/project/debian.glite-lb-server.dirs | 1 - org.glite.lb.server/project/debian.glite-lb-server.install | 1 - org.glite.lb.server/project/glite-lb-server.spec | 5 ----- org.glite.lb.server/src/lb_authz.c | 4 ++++ org.glite.lb/configure | 12 +++--------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 49116eb..1a6df14 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -27,6 +27,7 @@ version=${module.version} default all: compile GLITE_LB_SERVER_WITH_WS=yes +GLITE_LB_SERVER_WITH_LCAS=no ifdef LB_STANDALONE LB_STANDALONE_FLAGS:=-DLB_STANDALONE @@ -81,8 +82,10 @@ endif GRIDSITE_CFLAGS?=-I${gridsite_prefix}/include `xml2-config --cflags` GRIDSITE_LIBS?=-L${gridsite_prefix}/${libdir} -L${gridsite_prefix}/lib -lgridsite_globus `xml2-config --libs` -LCAS_CFLAGS?=-I${lcas_prefix}/include -I${lcas_prefix}/include/glite/security +ifeq (${GLITE_LB_SERVER_WITH_LCAS},yes) +LCAS_CFLAGS?=-I${lcas_prefix}/include -I${lcas_prefix}/include/glite/security -DHAVE_LCAS LCAS_LIBS?=-L${lcas_prefix}/${libdir} -llcas +endif ifneq (${classads_prefix},/usr) classads_libs := -L${classads_prefix}/${libdir} -L${classads_prefix}/lib @@ -256,9 +259,11 @@ LIB_OBJS_BK:= \ MONDB_OBJS:=mon-db.o ${LIB_OBJS_BK} MONDB_LIBS:=${COMMON_LIBS} ${LB_MACHINE_LIB} ${LB_UTILS_DB_LIB} ${EXT_LIBS} +ifeq (${GLITE_LB_SERVER_WITH_LCAS},yes) LCAS_PLUGIN_OBJS:=lcas_lb.o LCAS_PLUGIN_LOBJS:=${LCAS_PLUGIN_OBJS:.o=.lo} LCAS_PLUGIN_LIB:=liblcas_lb.la +endif EXAMPLES= @@ -378,8 +383,10 @@ install: ${INSTALL} -m 755 "glite-lb-$$p" "${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-$$p"; \ done -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules - ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules - ln -sf liblcas_lb.so ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules/lcas_lb.mod + if test -n "${LCAS_PLUGIN_LIB}"; then \ + ${INSTALL} -m 755 ${LCAS_PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules; \ + ln -sf liblcas_lb.so ${DESTDIR}${PREFIX}${prefix}/${libdir}/modules/lcas_lb.mod; \ + fi ${INSTALL} -m 755 ${top_srcdir}/src/notif-keeper.sh ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-notif-keeper for f in dbsetup.sql index.conf.template; do \ diff --git a/org.glite.lb.server/project/debian.glite-lb-server.dirs b/org.glite.lb.server/project/debian.glite-lb-server.dirs index 966ad02..959edf7 100644 --- a/org.glite.lb.server/project/debian.glite-lb-server.dirs +++ b/org.glite.lb.server/project/debian.glite-lb-server.dirs @@ -9,7 +9,6 @@ usr/include usr/include/glite usr/include/glite/lb usr/lib -usr/lib/modules usr/sbin usr/share/doc/glite-lb-server usr/share/man/man1 diff --git a/org.glite.lb.server/project/debian.glite-lb-server.install b/org.glite.lb.server/project/debian.glite-lb-server.install index 6a6c788..44a9833 100644 --- a/org.glite.lb.server/project/debian.glite-lb-server.install +++ b/org.glite.lb.server/project/debian.glite-lb-server.install @@ -6,7 +6,6 @@ etc/mysql/conf.d/* etc/* usr/bin/* usr/include/glite/lb/* -usr/lib/modules/* usr/sbin/* usr/share/doc/glite-lb-server/* usr/share/man/man1/* diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec index 0089b6d..981865e 100644 --- a/org.glite.lb.server/project/glite-lb-server.spec +++ b/org.glite.lb.server/project/glite-lb-server.spec @@ -114,7 +114,6 @@ fi %defattr(-,root,root) %dir /etc/cron.d/ %dir /etc/glite-lb/ -%dir /usr/%{_lib}/modules/ %dir /usr/include/glite/ %dir /usr/include/glite/lb/ %dir /usr/share/doc/%{name}-%{version}/ @@ -125,10 +124,6 @@ fi /etc/cron.d/* /etc/glite-lb-index.conf.template /etc/init.d/glite-lb-bkserverd -/usr/%{_lib}/modules/lcas_lb.mod -/usr/%{_lib}/modules/liblcas_lb.so -/usr/%{_lib}/modules/liblcas_lb.so.0 -/usr/%{_lib}/modules/liblcas_lb.so.0.0.0 /usr/include/glite/lb/index.h /usr/include/glite/lb/lb_authz.h /usr/include/glite/lb/store.h diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c index 7d7865a..fa520c7 100644 --- a/org.glite.lb.server/src/lb_authz.c +++ b/org.glite.lb.server/src/lb_authz.c @@ -24,7 +24,9 @@ limitations under the License. #include #include #ifndef NO_GLOBUS_GSSAPI +#ifdef HAVE_LCAS #include "lcas/lcas_pem.h" +#endif #include "voms/voms_apic.h" #endif #include "glite/lb/context-int.h" @@ -964,6 +966,7 @@ check_store_authz(edg_wll_Context ctx, edg_wll_Event *ev) } #ifndef NO_GLOBUS_GSSAPI +#ifdef HAVE_LCAS if (enable_lcas) { /* XXX make a real RSL ? */ request = (char *) action2name(action); @@ -980,6 +983,7 @@ check_store_authz(edg_wll_Context ctx, edg_wll_Event *ev) goto end; } #endif +#endif /* by default the server is open to any authenticated client */ if (policy_file == NULL) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index 4be8ff9..eba7d34 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -126,10 +126,6 @@ my %externs = ( gridsite => { prefix => '/opt/glite' }, - lcas => { - prefix => '/opt/glite', - pkg => 'lcas' - }, trustmanager => { prefix => '/opt/glite' }, @@ -600,7 +596,7 @@ BEGIN{ 'lb.logger' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool:B globus:B pkgconfig:B/ ], 'lb.nagios' => [ qw/globus_proxy_utils:R/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B lcas gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads:B voms:B gridsite:B bison:B libtool:B libxml2 flex:B pkgconfig:B/ ], 'lb.state-machine' => [ qw/classads:B libtool:B libxslt:B expat:B globus:B pkgconfig:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B globus:B pkgconfig:B/ ], 'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ], @@ -910,7 +906,6 @@ for my $ext (keys %deps_aux) { glue_schema=>'glue-schema', trustmanager=>'org.glite.security.trustmanager', axis=>'axis', - lcas=>'org.glite.security.lcas', gsoapxx=>'-', jdk=>'jdk', voms=>'org.glite.security.voms-api-cpp', @@ -924,7 +919,7 @@ for my $ext (keys %deps_aux) { }, etics_projects => { vdt=>[qw/globus globus_essentials globus_proxy_utils gpt/], - 'org.glite'=>[qw/voms gridsite lcas gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], + 'org.glite'=>[qw/voms gridsite gip_release gip_service bdii glite_version glite_info_templates glue_schema yaim_core/], }, etics_locations => { '*' => '', @@ -980,7 +975,6 @@ for my $ext (keys %deps_aux) { trustmanager=>'emi.java-security.trustmanager', trustmanager_axis=>'emi.java-security.trustmanager-axis', axis=>'axis1.4', - lcas=>'emi.sac.lcas', gsoapxx=>'-', jdk=>'java', voms => 'emi.voms.voms-api', @@ -1050,7 +1044,7 @@ for my $ext (keys %deps_aux) { }, }, etics_projects => { - 'emi'=>[qw/voms voms-devel gridsite lcas gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], + 'emi'=>[qw/voms voms-devel gridsite gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], }, etics_locations => { axis => 'axis', -- 1.8.2.3