Hello community, here is the log from the commit of package cyrus-sasl for openSUSE:Factory checked in at 2011-11-25 23:11:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cyrus-sasl (Old) and /work/SRC/openSUSE:Factory/.cyrus-sasl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cyrus-sasl", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cyrus-sasl/cyrus-sasl-saslauthd.changes 2011-11-21 12:34:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cyrus-sasl.new/cyrus-sasl-saslauthd.changes 2011-11-25 23:04:33.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 25 10:05:58 UTC 2011 - [email protected] + +- Removed debug printfs from cyrus-sasl.dif, added by accident +- Updated cyrus-sasl-gs2-not-overwrite-minor-error-code.dif with + latest upstream improvements + +------------------------------------------------------------------- cyrus-sasl.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ cyrus-sasl.spec: same change ++++++ cyrus-sasl-gs2-not-overwrite-minor-error-code.dif ++++++ --- /var/tmp/diff_new_pack.oaMk19/_old 2011-11-25 23:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.oaMk19/_new 2011-11-25 23:04:35.000000000 +0100 @@ -1,30 +1,69 @@ -From df039a4aba685990e47e5edb7bc9e09ff7daf56a Mon Sep 17 00:00:00 2001 -From: Ralf Haferkamp <[email protected]> -Date: Fri, 18 Nov 2011 10:06:22 +0100 -Subject: [PATCH] Don't overwrite minor error code before retrieving the error - message - ---- - plugins/gs2.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - Index: cyrus-sasl-2.1.25/plugins/gs2.c =================================================================== --- cyrus-sasl-2.1.25.orig/plugins/gs2.c +++ cyrus-sasl-2.1.25/plugins/gs2.c -@@ -531,6 +531,11 @@ fprintf(stderr,"gss_acquire_cred over an +@@ -336,7 +336,7 @@ gs2_server_mech_step(void *conn_context, + gss_name_t without = GSS_C_NO_NAME; + gss_OID_set_desc mechs; + OM_uint32 out_flags = 0; +- int ret = 0, equal = 0; ++ int ret = SASL_OK, equal = 0; + int initialContextToken = (text->gss_ctx == GSS_C_NO_CONTEXT); + char *p; + +@@ -463,14 +463,12 @@ gs2_server_mech_step(void *conn_context, + GSS_C_NT_USER_NAME, + &without); + if (GSS_ERROR(maj_stat)) { +- ret = SASL_FAIL; + goto cleanup; + } + + maj_stat = gss_compare_name(&min_stat, text->client_name, + without, &equal); + if (GSS_ERROR(maj_stat)) { +- ret = SASL_FAIL; + goto cleanup; + } + +@@ -486,8 +484,9 @@ gs2_server_mech_step(void *conn_context, + ret = params->canon_user(params->utils->conn, + text->authzid, 0, + SASL_CU_AUTHZID, oparams); +- if (ret != SASL_OK) ++ if (ret != SASL_OK) { + goto cleanup; ++ } + } + + ret = params->canon_user(params->utils->conn, +@@ -496,8 +495,9 @@ gs2_server_mech_step(void *conn_context, + ? (SASL_CU_AUTHZID | SASL_CU_AUTHID) + : SASL_CU_AUTHID, + oparams); +- if (ret != SASL_OK) ++ if (ret != SASL_OK) { + goto cleanup; ++ } + + switch (text->gs2_flags & GS2_CB_FLAG_MASK) { + case GS2_CB_FLAG_N: +@@ -528,19 +528,23 @@ gs2_server_mech_step(void *conn_context, ret = SASL_OK; cleanup: +- if (initialContextToken) + if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) { + sasl_gs2_seterror(text->utils, maj_stat, min_stat); + ret = SASL_FAIL; + } + - if (initialContextToken) ++////Can set maj_stat to gss_release_buffer return value and check ++ if (initialContextToken) { gss_release_buffer(&min_stat, &input_token); ++ } gss_release_buffer(&min_stat, &name_buf); -@@ -538,10 +543,6 @@ cleanup: + gss_release_buffer(&min_stat, &short_name_buf); gss_release_buffer(&min_stat, &output_token); gss_release_name(&min_stat, &without); @@ -32,24 +71,134 @@ - sasl_gs2_seterror(text->utils, maj_stat, min_stat); - ret = SASL_FAIL; - } - if (ret < SASL_OK) +- if (ret < SASL_OK) ++ if (ret < SASL_OK) { sasl_gs2_free_context_contents(text); ++ } + + return ret; + } +@@ -698,12 +702,14 @@ static int gs2_client_mech_step(void *co + + if (text->gss_ctx == GSS_C_NO_CONTEXT) { + ret = gs2_get_init_creds(text, params, prompt_need, oparams); +- if (ret != SASL_OK) ++ if (ret != SASL_OK) { + goto cleanup; ++ } + + initialContextToken = 1; +- } else ++ } else { + initialContextToken = 0; ++ } + + if (text->server_name == GSS_C_NO_NAME) { /* only once */ + name_buf.length = strlen(params->service) + 1 + strlen(params->serverFQDN); +@@ -729,8 +735,10 @@ static int gs2_client_mech_step(void *co + params->utils->free(name_buf.value); + name_buf.value = NULL; + +- if (GSS_ERROR(maj_stat)) ++ if (GSS_ERROR(maj_stat)) { ++ ret = SASL_OK; + goto cleanup; ++ } + } + + /* From GSSAPI plugin: apparently this is for some IMAP bug workaround */ +@@ -762,8 +770,9 @@ static int gs2_client_mech_step(void *co + strcmp(oparams->user, oparams->authid) ? + (char *) oparams->user : NULL, + &text->out_buf, &text->out_buf_len); +- if (ret != 0) ++ if (ret != 0) { + goto cleanup; ++ } + } -@@ -838,13 +839,14 @@ static int gs2_client_mech_step(void *co + req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; +@@ -783,13 +792,16 @@ static int gs2_client_mech_step(void *co + &output_token, + &ret_flags, + &text->lifetime); +- if (GSS_ERROR(maj_stat)) ++ if (GSS_ERROR(maj_stat)) { ++ ret = SASL_OK; + goto cleanup; ++ } + + ret = gs2_make_message(text, params, initialContextToken, &output_token, + &text->out_buf, &text->out_buf_len); +- if (ret != 0) ++ if (ret != 0) { + goto cleanup; ++ } + + *clientout = text->out_buf; + *clientoutlen = text->out_buf_len; +@@ -799,9 +811,9 @@ static int gs2_client_mech_step(void *co + goto cleanup; + } + +- if (text->client_name != GSS_C_NO_NAME) ++ if (text->client_name != GSS_C_NO_NAME) { + gss_release_name(&min_stat, &text->client_name); +- ++ } + maj_stat = gss_inquire_context(&min_stat, + text->gss_ctx, + &text->client_name, +@@ -811,11 +823,13 @@ static int gs2_client_mech_step(void *co + &ret_flags, /* flags */ + NULL, + NULL); +- if (GSS_ERROR(maj_stat)) ++ if (GSS_ERROR(maj_stat)) { ++ ret = SASL_OK; + goto cleanup; ++ } + + if ((ret_flags & req_flags) != req_flags) { +- maj_stat = SASL_BADAUTH; ++ ret = SASL_BADAUTH; + goto cleanup; + } + +@@ -823,8 +837,10 @@ static int gs2_client_mech_step(void *co + text->client_name, + &name_buf, + NULL); +- if (GSS_ERROR(maj_stat)) ++ if (GSS_ERROR(maj_stat)) { ++ ret = SASL_OK; + goto cleanup; ++ } + + oparams->gss_peer_name = text->server_name; + oparams->gss_local_name = text->client_name; +@@ -834,16 +850,20 @@ static int gs2_client_mech_step(void *co + oparams->maxoutbuf = 0xFFFFFF; oparams->doneflag = 1; - cleanup: +-cleanup: - gss_release_buffer(&min_stat, &output_token); - gss_release_buffer(&min_stat, &name_buf); -- ++ ret = SASL_OK; + ++cleanup: if (ret == SASL_OK && maj_stat != GSS_S_COMPLETE) { sasl_gs2_seterror(text->utils, maj_stat, min_stat); ret = SASL_FAIL; } +- if (ret < SASL_OK) + + gss_release_buffer(&min_stat, &output_token); + gss_release_buffer(&min_stat, &name_buf); + - if (ret < SASL_OK) ++ if (ret < SASL_OK) { sasl_gs2_free_context_contents(text); ++ } + return ret; + } ++++++ cyrus-sasl.dif ++++++ --- /var/tmp/diff_new_pack.oaMk19/_old 2011-11-25 23:04:35.000000000 +0100 +++ /var/tmp/diff_new_pack.oaMk19/_new 2011-11-25 23:04:35.000000000 +0100 @@ -54,25 +54,3 @@ sbin_PROGRAMS = saslauthd testsaslauthd EXTRA_PROGRAMS = saslcache -Index: plugins/gs2.c -=================================================================== ---- plugins/gs2.c.orig -+++ plugins/gs2.c -@@ -374,6 +374,7 @@ gs2_server_mech_step(void *conn_context, - mechs.elements = (gss_OID)text->mechanism; - - if (params->gss_creds == GSS_C_NO_CREDENTIAL) { -+fprintf(stderr,"calling gss_acquire_cred\n"); - maj_stat = gss_acquire_cred(&min_stat, - text->server_name, - GSS_C_INDEFINITE, -@@ -382,7 +383,9 @@ gs2_server_mech_step(void *conn_context, - &text->server_creds, - NULL, - &text->lifetime); -+fprintf(stderr,"gss_acquire_cred returned: %d\n", maj_stat); - if (GSS_ERROR(maj_stat)) -+fprintf(stderr,"gss_acquire_cred over and out: %d\n", maj_stat); - goto cleanup; - } - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
