[Emacs-diffs] Changes to emacs/lib-src/pop.c,v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      08/08/05 18:06:53

Index: pop.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/pop.c,v
retrieving revision 1.40.2.5
retrieving revision 1.40.2.6
diff -u -b -r1.40.2.5 -r1.40.2.6
--- pop.c       5 Feb 2008 02:29:05 -0000       1.40.2.5
+++ pop.c       5 Aug 2008 18:06:53 -0000       1.40.2.6
@@ -1200,11 +1200,12 @@
       krb5_free_principal (kcontext, server);
       if (rem)
        {
-         if (err_ret && err_ret->text.length)
-           {
              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)
+           {
              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);