emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Emacs support for Heimdal vs MIT Kerberos (patch included)


From: Ulrich Mueller
Subject: Emacs support for Heimdal vs MIT Kerberos (patch included)
Date: Tue, 5 Aug 2008 17:24:48 +0200

[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  <address@hidden>

        * configure.in: Add checks for krb5_error.text and
        krb5_error.e_text struct members.

emacs/lib-src/ChangeLog:
2008-04-02  Ulrich Mueller  <address@hidden>

        * 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);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]