[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-33-g083206f
From: |
Simon Josefsson |
Subject: |
[SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-33-g083206f |
Date: |
Wed, 10 Mar 2010 22:13:33 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".
http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=083206fa10ef9b47e74c5198ddb757fe1f3ac5a6
The branch, master has been updated
via 083206fa10ef9b47e74c5198ddb757fe1f3ac5a6 (commit)
via 629a4651730f85720d50b3ccc4733af83fad352e (commit)
via 5aa4445df06d0cf9c75d28ab837080d3a8daf6af (commit)
from 7164bce36864840fe3f7cabbe022fcfe975f6c5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 083206fa10ef9b47e74c5198ddb757fe1f3ac5a6
Author: Simon Josefsson <address@hidden>
Date: Wed Mar 10 23:13:28 2010 +0100
Add.
commit 629a4651730f85720d50b3ccc4733af83fad352e
Author: Simon Josefsson <address@hidden>
Date: Wed Mar 10 22:11:00 2010 +0100
Less verbose.
commit 5aa4445df06d0cf9c75d28ab837080d3a8daf6af
Author: Simon Josefsson <address@hidden>
Date: Wed Mar 10 22:10:23 2010 +0100
Fix mem leak.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 ++
lib/gs2/server.c | 14 +++++++++++++-
tests/gssapi.c | 2 --
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 851d173..55191fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,6 +274,8 @@ tests/crypto
tests/digest-md5
tests/errors
tests/external
+tests/gs2-krb5
+tests/gssapi
tests/md5file
tests/name
tests/old-base64
diff --git a/lib/gs2/server.c b/lib/gs2/server.c
index 96bb79a..43d7110 100644
--- a/lib/gs2/server.c
+++ b/lib/gs2/server.c
@@ -216,6 +216,7 @@ _gsasl_gs2_server_step (Gsasl_session * sctx,
gss_OID mech_type;
int res;
OM_uint32 ret_flags;
+ int free_bufdesc1 = 0;
*output = NULL;
*output_len = 0;
@@ -254,6 +255,7 @@ _gsasl_gs2_server_step (Gsasl_session * sctx,
res = gss_encapsulate_token (&bufdesc2, state->mech_oid, &bufdesc1);
if (res != 1)
return res;
+ free_bufdesc1 = 1;
}
state->step++;
/* fall through */
@@ -272,10 +274,20 @@ _gsasl_gs2_server_step (Gsasl_session * sctx,
&state->cb,
&state->client,
&mech_type,
- &bufdesc2, &ret_flags, NULL, NULL);
+ &bufdesc2,
+ &ret_flags,
+ NULL,
+ NULL);
if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED)
return GSASL_GSSAPI_ACCEPT_SEC_CONTEXT_ERROR;
+ if (free_bufdesc1)
+ {
+ maj_stat = gss_release_buffer (&min_stat, &bufdesc1);
+ if (GSS_ERROR (maj_stat))
+ return GSASL_GSSAPI_RELEASE_BUFFER_ERROR;
+ }
+
*output = malloc (bufdesc2.length);
if (!*output)
return GSASL_MALLOC_ERROR;
diff --git a/tests/gssapi.c b/tests/gssapi.c
index 170b1f8..a2fdae3 100644
--- a/tests/gssapi.c
+++ b/tests/gssapi.c
@@ -44,8 +44,6 @@ callback (Gsasl * ctx, Gsasl_session * sctx, Gsasl_property
prop)
{
int rc = GSASL_NO_CALLBACK;
- printf ("Callback for property %d\n", prop);
-
switch (prop)
{
case GSASL_AUTHID:
hooks/post-receive
--
GNU gsasl
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gsasl branch, master, updated. gsasl-1-4-1-33-g083206f,
Simon Josefsson <=