From 25e8df145f791b0c90c3f539deea4c168529759f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 31 May 2007 19:40:37 +0000 Subject: [PATCH] New gsoap-plugin function for setting connection. Cleanups. --- org.glite.security.gsoap-plugin/interface/glite_gscompat.h | 4 ++-- org.glite.security.gsoap-plugin/interface/glite_gsplugin.h | 3 +++ org.glite.security.gsoap-plugin/src/glite_gsplugin.c | 8 ++++++++ org.glite.security.gss/Makefile | 3 +-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/org.glite.security.gsoap-plugin/interface/glite_gscompat.h b/org.glite.security.gsoap-plugin/interface/glite_gscompat.h index 38b7d96..234354e 100644 --- a/org.glite.security.gsoap-plugin/interface/glite_gscompat.h +++ b/org.glite.security.gsoap-plugin/interface/glite_gscompat.h @@ -1,5 +1,5 @@ -#ifndef GLIE_SECURITY_GSCOMPAT_H -#define GLIE_SECURITY_GSCOMPAT_H +#ifndef GLITE_SECURITY_GSCOMPAT_H +#define GLITE_SECURITY_GSCOMPAT_H #ident "$Header: " diff --git a/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h b/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h index 9aaeb2b..be3aa74 100644 --- a/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h +++ b/org.glite.security.gsoap-plugin/interface/glite_gsplugin.h @@ -3,6 +3,8 @@ #include +#include "glite/security/glite_gss.h" + #ifdef __cplusplus extern "C" { #endif @@ -19,6 +21,7 @@ extern void glite_gsplugin_set_udata(struct soap *, void *); extern void glite_gsplugin_set_timeout(glite_gsplugin_Context, struct timeval const *); extern int glite_gsplugin_set_credential(glite_gsplugin_Context, const char *, const char *); +extern void glite_gsplugin_set_connection(glite_gsplugin_Context, edg_wll_GssConnection *); extern int glite_gsplugin(struct soap *, struct soap_plugin *, void *); extern char *glite_gsplugin_errdesc(struct soap *); diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c index 52a2880..1131532 100644 --- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c +++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c @@ -130,6 +130,14 @@ glite_gsplugin_set_credential(glite_gsplugin_Context ctx, return 0; } +void +glite_gsplugin_set_connection(glite_gsplugin_Context ctx, edg_wll_GssConnection *conn) +{ + free(ctx->connection); + ctx->connection = malloc(sizeof(*ctx->connection)); + memcpy(ctx->connection, conn, sizeof(*ctx->connection)); +} + int glite_gsplugin(struct soap *soap, struct soap_plugin *p, void *arg) { diff --git a/org.glite.security.gss/Makefile b/org.glite.security.gss/Makefile index 7c337f2..03bd481 100644 --- a/org.glite.security.gss/Makefile +++ b/org.glite.security.gss/Makefile @@ -46,9 +46,8 @@ LDFLAGS:=${COVERAGE_FLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} -LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} -INSTALL:=libtool --mode=install install LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} +INSTALL:=libtool --mode=install install GLOBUS_INC:= -I${globus_prefix}/include/${nothrflavour} GLOBUS_THR_INC:= -I${globus_prefix}/include/${thrflavour} -- 1.8.2.3