merge changes on 3.0 branch (merge_pre-cares2head-2_src -> merge_30_31_src)

on 3.1

diff --git a/org.glite.security.gsoap-plugin/src/glite_gss.c b/org.glite.security.gsoap-plugin/src/glite_gss.c
index 02dc1bb..e13a63d 100644 (file)
--- a/org.glite.security.gsoap-plugin/src/glite_gss.c
+++ b/org.glite.security.gsoap-plugin/src/glite_gss.c
@@ -382,7 +382,7 @@ recv_token(int sock, void **token, size_t *token_length, struct timeval *to)
         expect = ssl_token_length(t, tl);
       }
 
-   } while ((count == 0) || (tl < expect));
+   } while (count != 0 && tl < expect);
 
 end:
    if (to) {
@@ -438,6 +438,12 @@ create_proxy(char *cert_file, char *key_file, char **proxy_file)
       goto end;
    }
 
+   len = write(out, "\n", 1);
+   if (len != 1) {
+      ret = EDG_WLL_GSS_ERROR_ERRNO;
+      goto end;
+   }
+
    in = open(key_file, O_RDONLY);
    if (in < 0) {
       ret = EDG_WLL_GSS_ERROR_ERRNO;