------------------------------------------------------------ revno: 13701 revision-id: squid3@treenet.co.nz-20141220180017-ire9aq4cso6eq7j5 parent: squid3@treenet.co.nz-20141220171025-klg12ilx88lold88 author: Markus Moeller committer: Amos Jeffries branch nick: 3.5 timestamp: Sat 2014-12-20 10:00:17 -0800 message: Fix typos in rev.13700 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141220180017-ire9aq4cso6eq7j5 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: dcbe2de314174e08aa8b173c6a115819cd6140de # timestamp: 2014-12-20 18:09:02 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141220171025-\ # klg12ilx88lold88 # # Begin patch === modified file 'helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc' --- helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2014-12-20 17:10:25 +0000 +++ helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc 2014-12-20 18:00:17 +0000 @@ -72,7 +72,7 @@ check_k5_err(krb5_context context, const char *function, krb5_error_code code) { - if (code) { + if (code && code != KRB5_KT_END) { const char *errmsg; errmsg = krb5_get_error_message(context, code); debug((char *) "%s| %s: ERROR: %s failed: %s\n", LogTime(), PROGRAM, function, errmsg); @@ -570,6 +570,11 @@ LogTime(), PROGRAM, memory_keytab_name); } } + ret = krb5_free_kt_list(context,ktlist); + if (check_k5_err(context, "krb5_free_kt_list", ret)) { + debug((char *) "%s| %s: ERROR: Freeing list failed\n", + LogTime(), PROGRAM); + } } krb5_free_context(context); #endif