From: Ulrich Mueller <ulm@gentoo.org>
To: emacs-devel@gnu.org
Cc: bug-gnu-emacs@gnu.org,
=?UTF-8?q?Martin MOKREJ=C5=A0?= <mmokrejs@ribosome.natur.cuni.cz>,
emacs@gentoo.org
Subject: Re: emacs-22.2: regression, cannot compile with heimdal but can with mit-krb5
Date: Fri, 04 Apr 2008 13:03:46 +0200 [thread overview]
Message-ID: <ulk3tnap9@a1ihome1.kph.uni-mainz.de> (raw)
In-Reply-To: mailman.9829.1207117718.18990.bug-gnu-emacs@gnu.org
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
>>>>> On Tue, 01 Apr 2008, Martin MOKREJŠ wrote:
> I would like to point you to the bug report at
> http://bugs.gentoo.org/show_bug.cgi?id=215558
> Briefly (credits to Michael Hammer (mueli)):
> Here is the definition of the krb5_error struct in mit-krb5 which
> seams compatible with emacs-22.2:
> [...]
> krb5_data text; /* descriptive text */
> krb5_data e_data; /* additional error-describing data */
> [...]
> and here is the heimdal code. You can see that the struct members
> are named differently:
> [...]
> heim_general_string *e_text;
> heim_octet_string *e_data;
> [...]
Hi,
Two alternative ways have been suggested (see Gentoo bug mentioned
above) to make Emacs compile also with Heimdal:
1. Honza Macháček has pointed out that there exists the
following patch from T2, which uses "e_data" instead of "text":
<http://svn.exactcode.de/t2/branches/7.0/package/security/heimdal/emacs-pop.diff>
2. The patch (by myself) attached to this message, which adds an
autoconf test, in order to determine if the struct contains a
"text" or "e_text" member. This compiles and links against
MIT Kerberos or against Heimdal.
Ulrich
[-- Attachment #2: emacs-22.2-pop-heimdal.patch --]
[-- Type: text/plain, Size: 1906 bytes --]
--- emacs-22.2-orig/configure.in 2008-04-02 18:28:37.000000000 +0200
+++ emacs-22.2/configure.in 2008-04-02 22:18:38.000000000 +0200
@@ -2700,7 +2700,9 @@
fi
if test "${with_kerberos5+set}" = set; then
- AC_CHECK_HEADERS(krb5.h)
+ AC_CHECK_HEADERS(krb5.h,
+ AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
+ [#include <krb5.h>]))
else
AC_CHECK_HEADERS(des.h,,
[AC_CHECK_HEADERS(kerberosIV/des.h,,
--- emacs-22.2-orig/lib-src/pop.c 2008-02-23 14:49:00.000000000 +0100
+++ emacs-22.2/lib-src/pop.c 2008-04-02 22:35:55.000000000 +0200
@@ -1200,11 +1200,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,
@@ -1213,12 +1214,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);
parent reply other threads:[~2008-04-04 11:03 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <mailman.9829.1207117718.18990.bug-gnu-emacs@gnu.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ulk3tnap9@a1ihome1.kph.uni-mainz.de \
--to=ulm@gentoo.org \
--cc=bug-gnu-emacs@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=emacs@gentoo.org \
--cc=mmokrejs@ribosome.natur.cuni.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).