From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.devel Subject: Re: Emacs support for Heimdal vs MIT Kerberos (patch included) Date: Wed, 6 Aug 2008 01:22:35 +0200 Message-ID: <18584.57531.229129.379307@a1ihome1.kph.uni-mainz.de> References: <18584.28864.366705.285809@a1i15.kph.uni-mainz.de> <87k5evl4h7.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1217996282 13156 80.91.229.12 (6 Aug 2008 04:18:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 6 Aug 2008 04:18:02 +0000 (UTC) Cc: mueli@gentoo.org, emacs-devel@gnu.org, emacs@gentoo.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 06 06:18:49 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KQaU5-0001UZ-AI for ged-emacs-devel@m.gmane.org; Wed, 06 Aug 2008 06:18:49 +0200 Original-Received: from localhost ([127.0.0.1]:44825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQaT9-0002fd-Ul for ged-emacs-devel@m.gmane.org; Wed, 06 Aug 2008 00:17:51 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KQVrV-0005eA-Uv for emacs-devel@gnu.org; Tue, 05 Aug 2008 19:22:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KQVrV-0005cQ-4n for emacs-devel@gnu.org; Tue, 05 Aug 2008 19:22:41 -0400 Original-Received: from [199.232.76.173] (port=40399 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQVrV-0005cH-0U for emacs-devel@gnu.org; Tue, 05 Aug 2008 19:22:41 -0400 Original-Received: from a1iwww1.kph.uni-mainz.de ([134.93.134.1]:38107) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KQVrU-0004ag-K6 for emacs-devel@gnu.org; Tue, 05 Aug 2008 19:22:40 -0400 Original-Received: from a1ihome1.kph.uni-mainz.de (a1ihome1.kph.uni-mainz.de [134.93.134.75]) by a1iwww1.kph.uni-mainz.de (8.14.0/8.13.4) with ESMTP id m75NMTB3007063; Wed, 6 Aug 2008 01:22:29 +0200 Original-Received: from a1ihome1.kph.uni-mainz.de (localhost [127.0.0.1]) by a1ihome1.kph.uni-mainz.de (8.14.0/8.14.1) with ESMTP id m75NMajW019336; Wed, 6 Aug 2008 01:22:36 +0200 Original-Received: (from ulm@localhost) by a1ihome1.kph.uni-mainz.de (8.14.0/8.14.0/Submit) id m75NMZiI019331; Wed, 6 Aug 2008 01:22:35 +0200 In-Reply-To: <87k5evl4h7.fsf@stupidchicken.com> X-Mailer: VM 8.0.2-487 under Emacs 22.2.1 (i686-pc-linux-gnu) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 1) X-Mailman-Approved-At: Wed, 06 Aug 2008 00:17:30 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:102111 Archived-At: >>>>> On Tue, 05 Aug 2008, Chong Yidong wrote: > Certainly looks safe enough. I've checked it into the branch, > thanks. Could you also generate a patch for the Emacs 23 trunk? Voila: Index: configure.in =================================================================== RCS file: /sources/emacs/emacs/configure.in,v retrieving revision 1.553 diff -u -B -r1.553 configure.in --- configure.in 4 Aug 2008 21:57:15 -0000 1.553 +++ configure.in 5 Aug 2008 23:10:47 -0000 @@ -2235,7 +2235,9 @@ fi if test "${with_kerberos5}" != no; then - AC_CHECK_HEADERS(krb5.h) + AC_CHECK_HEADERS(krb5.h, + AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,, + [#include ])) else AC_CHECK_HEADERS(des.h,, [AC_CHECK_HEADERS(kerberosIV/des.h,, Index: lib-src/pop.c =================================================================== RCS file: /sources/emacs/emacs/lib-src/pop.c,v retrieving revision 1.51 diff -u -B -r1.51 pop.c --- lib-src/pop.c 2 Jun 2008 06:00:51 -0000 1.51 +++ lib-src/pop.c 5 Aug 2008 23:10:59 -0000 @@ -1254,11 +1254,12 @@ krb5_free_principal (kcontext, server); if (rem) { + strcpy (pop_error, KRB_ERROR); + strncat (pop_error, error_message (rem), + ERROR_MAX - sizeof (KRB_ERROR)); +#if defined HAVE_KRB5_ERROR_TEXT if (err_ret && err_ret->text.length) { - strcpy (pop_error, KRB_ERROR); - strncat (pop_error, error_message (rem), - ERROR_MAX - sizeof (KRB_ERROR)); strncat (pop_error, " [server says '", ERROR_MAX - strlen (pop_error) - 1); strncat (pop_error, err_ret->text.data, @@ -1267,12 +1268,17 @@ strncat (pop_error, "']", ERROR_MAX - strlen (pop_error) - 1); } - else +#elif defined HAVE_KRB5_ERROR_E_TEXT + if (err_ret && err_ret->e_text && strlen(*err_ret->e_text)) { - strcpy (pop_error, KRB_ERROR); - strncat (pop_error, error_message (rem), - ERROR_MAX - sizeof (KRB_ERROR)); + strncat (pop_error, " [server says '", + ERROR_MAX - strlen (pop_error) - 1); + strncat (pop_error, *err_ret->e_text, + ERROR_MAX - strlen (pop_error) - 1); + strncat (pop_error, "']", + ERROR_MAX - strlen (pop_error) - 1); } +#endif if (err_ret) krb5_free_error (kcontext, err_ret); krb5_auth_con_free (kcontext, auth_context);