From 96444c940e7ea82e43c1edd5566b4cdf1eb6162d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Mon, 17 Jul 2006 07:39:23 +0000 Subject: [PATCH] merge the 1.3 -> 1.5 diff on the 3.0 branch fixes for #13988 and #18123 --- org.glite.security.gsoap-plugin/src/glite_gss.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.glite.security.gsoap-plugin/src/glite_gss.c b/org.glite.security.gsoap-plugin/src/glite_gss.c index 36025fa..d50832e 100644 --- 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; -- 1.8.2.3