merge 313_5

diff --git a/org.glite.lbjp-common.server-bones/src/srvbones.c b/org.glite.lbjp-common.server-bones/src/srvbones.c
index cfea0c2..047e26b 100644 (file)
--- a/org.glite.lbjp-common.server-bones/src/srvbones.c
+++ b/org.glite.lbjp-common.server-bones/src/srvbones.c
@@ -135,6 +135,7 @@ int glite_srvbones_run(
 
        sa.sa_handler = SIG_IGN;
        sigaction(SIGUSR1, &sa, NULL);
+       sigaction(SIGXFSZ, &sa, NULL);
 
        sigemptyset(&sset);
        sigaddset(&sset, SIGCHLD);

diff --git a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
index 3f1c57e..5b7da65 100644 (file)
--- a/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
+++ b/org.glite.security.gsoap-plugin/src/glite_gsplugin.c
@@ -126,6 +126,9 @@ glite_gsplugin_set_credential(glite_gsplugin_Context ctx,
       return EINVAL;
    }
 
+   free(ctx->cert_filename);
+   free(ctx->key_filename);
+
    ctx->cert_filename = strdup(cert);
    ctx->key_filename = strdup(key);
 

diff --git a/org.glite.security.gss/src/glite_gss.c b/org.glite.security.gss/src/glite_gss.c
index faf16d3..a62e2e7 100644 (file)
--- a/org.glite.security.gss/src/glite_gss.c
+++ b/org.glite.security.gss/src/glite_gss.c
@@ -12,6 +12,7 @@
 #include <sys/stat.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <ares.h>
 #include <errno.h>
 
@@ -184,10 +185,14 @@ do_connect(int *s, char const *hostname, int port, struct timeval *timeout)
    socklen_t err_len;
    char *addr;
    int h_errno;
+   int opt;
 
    sock = socket(AF_INET, SOCK_STREAM, 0);
    if (sock < 0) return EDG_WLL_GSS_ERROR_ERRNO;
 
+   opt = 1;
+   setsockopt(sock,IPPROTO_TCP,TCP_NODELAY,&opt,sizeof opt);
+
    if (timeout) {
             int        flags = fcntl(sock, F_GETFL, 0);
             if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) < 0)
@@ -674,7 +679,7 @@ edg_wll_gss_connect(edg_wll_GssCred cred, char const *hostname, int port,
       /* XXX verify ret_flags match what was requested */
       maj_stat = gss_init_sec_context(&min_stat, cred->gss_cred, &context,
                                      GSS_C_NO_NAME, GSS_C_NO_OID,
-                                     req_flags | GSS_C_MUTUAL_FLAG,
+                                     req_flags | GSS_C_MUTUAL_FLAG | GSS_C_CONF_FLAG,
                                      0, GSS_C_NO_CHANNEL_BINDINGS,
                                      &input_token, NULL, &output_token,
                                      NULL, NULL);