* Emacs support for Heimdal vs MIT Kerberos (patch included)
@ 2008-08-05 15:24 Ulrich Mueller
2008-08-05 18:08 ` Chong Yidong
0 siblings, 1 reply; 4+ messages in thread
From: Ulrich Mueller @ 2008-08-05 15:24 UTC (permalink / raw)
To: emacs-devel; +Cc: mueli, emacs
[I had sent this patch already in April, but the message was lost or ignored.]
From Gentoo Bug 215558, <http://bugs.gentoo.org/show_bug.cgi?id=215558>:
Emacs 22.2 (or rather movemail / pop.c) can only be build with MIT
Kerberos but not with Heimdal.
Briefly (credits to Michael Hammer):
> Here is the definition of the krb5_error struct in mit-krb5 which
> seems compatible with emacs-22.2:
> typedef struct _krb5_error {
> [...]
> krb5_data text; /* descriptive text */
> krb5_data e_data; /* additional error-describing data */
> } krb5_error;
> and here is the heimdal code. You can see that the struct members
> are named differently:
> typedef struct KRB_ERROR {
> [...]
> heim_general_string *e_text;
> heim_octet_string *e_data;
> } KRB_ERROR;
> You can see the difference:
> krb5_data text; <-> heim_general_string *e_text;
> ---
> text <-> e_text
Attached patch will make pop.c properly compile/link with the Heimdal
headers and library.
For the MIT-Kerberos case the resulting code is equivalent, so I think
that this should be included into the Emacs 22 branch.
Ulrich
emacs/ChangeLog:
2008-04-02 Ulrich Mueller <ulm@gentoo.org>
* configure.in: Add checks for krb5_error.text and
krb5_error.e_text struct members.
emacs/lib-src/ChangeLog:
2008-04-02 Ulrich Mueller <ulm@gentoo.org>
* pop.c (socket_connection): Add conditionals for
HAVE_KRB5_ERROR_TEXT and HAVE_KRB5_ERROR_E_TEXT to support
compilation with MIT Kerberos and Heimdal, respectively.
--- 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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Emacs support for Heimdal vs MIT Kerberos (patch included)
2008-08-05 15:24 Emacs support for Heimdal vs MIT Kerberos (patch included) Ulrich Mueller
@ 2008-08-05 18:08 ` Chong Yidong
2008-08-05 23:22 ` Ulrich Mueller
0 siblings, 1 reply; 4+ messages in thread
From: Chong Yidong @ 2008-08-05 18:08 UTC (permalink / raw)
To: Ulrich Mueller; +Cc: mueli, emacs, emacs-devel
Ulrich Mueller <ulm@gentoo.org> writes:
> [I had sent this patch already in April, but the message was lost or
> ignored.]
Sorry about that, this must have slipped under the radar.
> From Gentoo Bug 215558,
> <http://bugs.gentoo.org/show_bug.cgi?id=215558>: Emacs 22.2 (or rather
> movemail / pop.c) can only be build with MIT Kerberos but not with
> Heimdal.
>
> Attached patch will make pop.c properly compile/link with the Heimdal
> headers and library.
>
> For the MIT-Kerberos case the resulting code is equivalent, so I think
> that this should be included into the Emacs 22 branch.
Certainly looks safe enough. I've checked it into the branch, thanks.
Could you also generate a patch for the Emacs 23 trunk?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Emacs support for Heimdal vs MIT Kerberos (patch included)
2008-08-05 18:08 ` Chong Yidong
@ 2008-08-05 23:22 ` Ulrich Mueller
2008-08-05 23:45 ` Chong Yidong
0 siblings, 1 reply; 4+ messages in thread
From: Ulrich Mueller @ 2008-08-05 23:22 UTC (permalink / raw)
To: Chong Yidong; +Cc: mueli, emacs-devel, emacs
>>>>> 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 <krb5.h>]))
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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Emacs support for Heimdal vs MIT Kerberos (patch included)
2008-08-05 23:22 ` Ulrich Mueller
@ 2008-08-05 23:45 ` Chong Yidong
0 siblings, 0 replies; 4+ messages in thread
From: Chong Yidong @ 2008-08-05 23:45 UTC (permalink / raw)
To: Ulrich Mueller; +Cc: mueli, emacs-devel, emacs
Ulrich Mueller <ulm@kph.uni-mainz.de> writes:
>> Certainly looks safe enough. I've checked it into the branch,
>> thanks. Could you also generate a patch for the Emacs 23 trunk?
>
> Voila:
Checked in, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-08-05 23:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-05 15:24 Emacs support for Heimdal vs MIT Kerberos (patch included) Ulrich Mueller
2008-08-05 18:08 ` Chong Yidong
2008-08-05 23:22 ` Ulrich Mueller
2008-08-05 23:45 ` Chong Yidong
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).