gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gsasl branch, gsasl_1_6_x, updated. gsasl-1-6-1-5-ge09f7c3


From: Simon Josefsson
Subject: [SCM] GNU gsasl branch, gsasl_1_6_x, updated. gsasl-1-6-1-5-ge09f7c3
Date: Mon, 21 Nov 2011 12:24:09 +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=e09f7c3b0491d7377cd9496212f0b94ff935ee95

The branch, gsasl_1_6_x has been updated
       via  e09f7c3b0491d7377cd9496212f0b94ff935ee95 (commit)
       via  7ea84a86858cac4774a486096cd37c6e1e7e6235 (commit)
       via  3fc0ee8815408b887e62856cecb450ceeb41af80 (commit)
      from  134b3042670ed7b88f2bb83dbecee1159326b63d (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 e09f7c3b0491d7377cd9496212f0b94ff935ee95
Author: Simon Josefsson <address@hidden>
Date:   Mon Nov 21 13:24:03 2011 +0100

    Ignore more.

commit 7ea84a86858cac4774a486096cd37c6e1e7e6235
Author: Simon Josefsson <address@hidden>
Date:   Mon Nov 21 12:41:00 2011 +0100

    Disable test-poll for this branch, since it breaks on Solaris.
    
    Reported by Dagobert Michelsen <address@hidden>.

commit 3fc0ee8815408b887e62856cecb450ceeb41af80
Author: Simon Josefsson <address@hidden>
Date:   Mon Nov 21 12:37:23 2011 +0100

    gssapi: Don't output zero-length tokens on success.
    
    Reported by Andreas Oberritter <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore          |    6 ++++++
 gltests/Makefile.am |    2 +-
 lib/gssapi/server.c |   21 ++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 182f337..0a3993e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -403,6 +403,8 @@ lib/gl/gc-libgcrypt.lo
 lib/gl/gc-libgcrypt.o
 lib/gl/gc-pbkdf2-sha1.lo
 lib/gl/gc-pbkdf2-sha1.o
+lib/gl/gss-extra.lo
+lib/gl/gss-extra.o
 lib/gl/libgl.la
 lib/gl/memmem.lo
 lib/gl/memmem.o
@@ -527,6 +529,7 @@ lib/login/mechinfo.o
 lib/login/server.lo
 lib/login/server.o
 lib/m4/codeset.m4
+lib/m4/fcntl-o.m4
 lib/m4/gettext.m4
 lib/m4/glibc2.m4
 lib/m4/glibc21.m4
@@ -555,6 +558,7 @@ lib/m4/printf-posix.m4
 lib/m4/progtest.m4
 lib/m4/size_max.m4
 lib/m4/stdint_h.m4
+lib/m4/threadlib.m4
 lib/m4/uintmax_t.m4
 lib/m4/visibility.m4
 lib/m4/wchar_t.m4
@@ -684,6 +688,7 @@ lib/tests/test-error
 lib/tests/test-error.o
 libtool
 m4/codeset.m4
+m4/fcntl-o.m4
 m4/gettext.m4
 m4/glibc2.m4
 m4/glibc21.m4
@@ -712,6 +717,7 @@ m4/printf-posix.m4
 m4/progtest.m4
 m4/size_max.m4
 m4/stdint_h.m4
+m4/threadlib.m4
 m4/uintmax_t.m4
 m4/visibility.m4
 m4/wchar_t.m4
diff --git a/gltests/Makefile.am b/gltests/Makefile.am
index fabb0a0..83bd02f 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -528,7 +528,7 @@ EXTRA_DIST += test-poll-h.c
 
 ## begin gnulib module poll-tests
 
-TESTS += test-poll
+#TESTS += test-poll
 check_PROGRAMS += test-poll
 test_poll_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB)
 EXTRA_DIST += signature.h test-poll.c
diff --git a/lib/gssapi/server.c b/lib/gssapi/server.c
index f76430e..9bea963 100644
--- a/lib/gssapi/server.c
+++ b/lib/gssapi/server.c
@@ -165,18 +165,25 @@ _gsasl_gssapi_server_step (Gsasl_session * sctx,
       if (maj_stat == GSS_S_COMPLETE)
        state->step++;
 
-      *output = malloc (bufdesc2.length);
-      if (!*output)
-       return GSASL_MALLOC_ERROR;
-      memcpy (*output, bufdesc2.value, bufdesc2.length);
-      *output_len = bufdesc2.length;
+      if (maj_stat == GSS_S_CONTINUE_NEEDED || bufdesc2.length > 0)
+       {
+         *output = malloc (bufdesc2.length);
+         if (!*output)
+           return GSASL_MALLOC_ERROR;
+         memcpy (*output, bufdesc2.value, bufdesc2.length);
+         *output_len = bufdesc2.length;
+       }
 
       maj_stat = gss_release_buffer (&min_stat, &bufdesc2);
       if (GSS_ERROR (maj_stat))
        return GSASL_GSSAPI_RELEASE_BUFFER_ERROR;
 
-      res = GSASL_NEEDS_MORE;
-      break;
+      if (maj_stat == GSS_S_CONTINUE_NEEDED || *output_len > 0)
+       {
+         res = GSASL_NEEDS_MORE;
+         break;
+       }
+      /* fall through */
 
     case 2:
       memset (tmp, 0xFF, 4);


hooks/post-receive
-- 
GNU gsasl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]