Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 215558 | Differences between
and this patch

Collapse All | Expand All

(-)emacs-22.2-orig/configure.in (-1 / +3 lines)
Lines 2700-2706 Link Here
2700
  fi
2700
  fi
2701
2701
2702
  if test "${with_kerberos5+set}" = set; then
2702
  if test "${with_kerberos5+set}" = set; then
2703
    AC_CHECK_HEADERS(krb5.h)
2703
    AC_CHECK_HEADERS(krb5.h,
2704
      AC_CHECK_MEMBERS([krb5_error.text, krb5_error.e_text],,,
2705
		       [#include <krb5.h>]))
2704
  else
2706
  else
2705
    AC_CHECK_HEADERS(des.h,,
2707
    AC_CHECK_HEADERS(des.h,,
2706
		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
2708
		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
(-)emacs-22.2-orig/lib-src/pop.c (-7 / +13 lines)
Lines 1200-1210 Link Here
1200
      krb5_free_principal (kcontext, server);
1200
      krb5_free_principal (kcontext, server);
1201
      if (rem)
1201
      if (rem)
1202
	{
1202
	{
1203
	  strcpy (pop_error, KRB_ERROR);
1204
	  strncat (pop_error, error_message (rem),
1205
		   ERROR_MAX - sizeof (KRB_ERROR));
1206
#if defined HAVE_KRB5_ERROR_TEXT
1203
	  if (err_ret && err_ret->text.length)
1207
	  if (err_ret && err_ret->text.length)
1204
	    {
1208
	    {
1205
	      strcpy (pop_error, KRB_ERROR);
1206
	      strncat (pop_error, error_message (rem),
1207
		       ERROR_MAX - sizeof (KRB_ERROR));
1208
	      strncat (pop_error, " [server says '",
1209
	      strncat (pop_error, " [server says '",
1209
		       ERROR_MAX - strlen (pop_error) - 1);
1210
		       ERROR_MAX - strlen (pop_error) - 1);
1210
	      strncat (pop_error, err_ret->text.data,
1211
	      strncat (pop_error, err_ret->text.data,
Lines 1213-1224 Link Here
1213
	      strncat (pop_error, "']",
1214
	      strncat (pop_error, "']",
1214
		       ERROR_MAX - strlen (pop_error) - 1);
1215
		       ERROR_MAX - strlen (pop_error) - 1);
1215
	    }
1216
	    }
1216
	  else
1217
#elif defined HAVE_KRB5_ERROR_E_TEXT
1218
	  if (err_ret && err_ret->e_text && strlen(*err_ret->e_text))
1217
	    {
1219
	    {
1218
	      strcpy (pop_error, KRB_ERROR);
1220
	      strncat (pop_error, " [server says '",
1219
	      strncat (pop_error, error_message (rem),
1221
		       ERROR_MAX - strlen (pop_error) - 1);
1220
		       ERROR_MAX - sizeof (KRB_ERROR));
1222
	      strncat (pop_error, *err_ret->e_text,
1223
		       ERROR_MAX - strlen (pop_error) - 1);
1224
	      strncat (pop_error, "']",
1225
		       ERROR_MAX - strlen (pop_error) - 1);
1221
	    }
1226
	    }
1227
#endif
1222
	  if (err_ret)
1228
	  if (err_ret)
1223
	    krb5_free_error (kcontext, err_ret);
1229
	    krb5_free_error (kcontext, err_ret);
1224
	  krb5_auth_con_free (kcontext, auth_context);
1230
	  krb5_auth_con_free (kcontext, auth_context);

Return to bug 215558