summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-03-27 21:22:14 +0000
committerJeffrey Stedfast <fejj@src.gnome.org>2003-03-27 21:22:14 +0000
commit7a068e9381111c1508e70c7fbd0f54c1a81606fa (patch)
tree87843bfe3abe3de50b35b4667e2990eb7c53019a
parent60513b42d4766b630b3720d5fe751a577ee485e3 (diff)
downloadevolution-data-server-7a068e9381111c1508e70c7fbd0f54c1a81606fa.tar.gz
Get rid of debug printf's that are no longer needed. In the case of
2003-03-27 Jeffrey Stedfast <fejj@ximian.com> * camel-sasl-gssapi.c (gssapi_challenge): Get rid of debug printf's that are no longer needed. In the case of errors, don't release the outbuf gss_buffer_t since it shouldn't be set. Also g_free (str) when we are done with it.
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-sasl-gssapi.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8a81d3c30..a87558fe3 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-27 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-sasl-gssapi.c (gssapi_challenge): Get rid of debug
+ printf's that are no longer needed. In the case of errors, don't
+ release the outbuf gss_buffer_t since it shouldn't be set. Also
+ g_free (str) when we are done with it.
+
2003-03-26 Jeffrey Stedfast <fejj@ximian.com>
* camel-sasl-gssapi.c (camel_sasl_gssapi_finalize): Pass in the
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 5bc018ed3..9faa1d809 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -259,7 +259,6 @@ gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
break;
default:
gssapi_set_exception (major, minor, ex);
- gss_release_buffer (&minor, &outbuf);
return NULL;
}
@@ -280,7 +279,6 @@ gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
major = gss_unwrap (&minor, priv->ctx, &inbuf, &outbuf, &conf_state, &qop);
if (major != GSS_S_COMPLETE) {
gssapi_set_exception (major, minor, ex);
- gss_release_buffer (&minor, &outbuf);
return NULL;
}
@@ -307,13 +305,13 @@ gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
gss_release_buffer (&minor, &outbuf);
major = gss_wrap (&minor, priv->ctx, FALSE, qop, &inbuf, &conf_state, &outbuf);
- if (major != 0) {
+ if (major != GSS_S_COMPLETE) {
gssapi_set_exception (major, minor, ex);
- gss_release_buffer (&minor, &outbuf);
g_free (str);
return NULL;
}
+ g_free (str);
challenge = g_byte_array_new ();
g_byte_array_append (challenge, outbuf.value, outbuf.length);
gss_release_buffer (&minor, &outbuf);