From 67d2de61b508dcd3e2a9aba8bafda77be6efaa04 Mon Sep 17 00:00:00 2001 From: kouril Date: Wed, 22 Nov 2006 10:32:58 +0000 Subject: [PATCH] Pushed version to 5.3 - made on a separate branch as this release is only a bug fix releas addressing a potential security problem. I don't want to mix it with other stuff that was already commited to HEAD --- configure.in | 2 +- src/mod_auth_kerb.c | 26 ++++++++------------------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 1f120b7..96f9330 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_REVISION($Revision$) AC_PREREQ(2.57) -AC_INIT(mod_auth_kerb, 5.2, modauthkerb-developers@lists.sourceforge.net) +AC_INIT(mod_auth_kerb, 5.3, modauthkerb-developers@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/mod_auth_kerb.c]) AC_CONFIG_HEADER([config.h]) diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c index 380c8ab..44fd1ca 100644 --- a/src/mod_auth_kerb.c +++ b/src/mod_auth_kerb.c @@ -50,7 +50,7 @@ #include #include -#define MODAUTHKERB_VERSION "5.2" +#define MODAUTHKERB_VERSION "5.3" #define MECH_NEGOTIATE "Negotiate" #define SERVICE_NAME "HTTP" @@ -1044,10 +1044,6 @@ get_gss_error(MK_POOL *p, OM_uint32 err_maj, OM_uint32 err_min, char *prefix) gss_buffer_desc status_string; char *err_msg; - log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, - "GSS-API major_status:%8.8x, minor_status:%8.8x", - err_maj, err_min); - err_msg = apr_pstrdup(p, prefix); do { maj_stat = gss_display_status (&min_stat, @@ -1056,16 +1052,11 @@ get_gss_error(MK_POOL *p, OM_uint32 err_maj, OM_uint32 err_min, char *prefix) GSS_C_NO_OID, &msg_ctx, &status_string); - if (!GSS_ERROR(maj_stat)) { - err_msg = apr_pstrcat(p, err_msg, ": ", - (char*) status_string.value, NULL); - gss_release_buffer(&min_stat, &status_string); - } - } while (!GSS_ERROR(maj_stat) && msg_ctx != 0); - - msg_ctx = 0; - err_msg = apr_pstrcat(p, err_msg, " (", NULL); - do { + if (GSS_ERROR(maj_stat)) + break; + err_msg = apr_pstrcat(p, err_msg, ": ", (char*) status_string.value, NULL); + gss_release_buffer(&min_stat, &status_string); + maj_stat = gss_display_status (&min_stat, err_min, GSS_C_MECH_CODE, @@ -1073,12 +1064,11 @@ get_gss_error(MK_POOL *p, OM_uint32 err_maj, OM_uint32 err_min, char *prefix) &msg_ctx, &status_string); if (!GSS_ERROR(maj_stat)) { - err_msg = apr_pstrcat(p, err_msg, ", ", - (char *) status_string.value, NULL); + err_msg = apr_pstrcat(p, err_msg, + " (", (char*) status_string.value, ")", NULL); gss_release_buffer(&min_stat, &status_string); } } while (!GSS_ERROR(maj_stat) && msg_ctx != 0); - err_msg = apr_pstrcat(p, err_msg, ")", NULL); return err_msg; } -- 2.1.4