View | Details | Raw Unified
Collapse All | Expand All

(-) emacs-22.2-orig/lib-src/pop.c (-8 / +16 lines)
 Lines 2700-2706    Link Here 
  fi
  fi
  if test "${with_kerberos5+set}" = set; then
  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
  else
    AC_CHECK_HEADERS(des.h,,
    AC_CHECK_HEADERS(des.h,,
		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
		     [AC_CHECK_HEADERS(kerberosIV/des.h,,
 Lines 1200-1210    Link Here 
      krb5_free_principal (kcontext, server);
      krb5_free_principal (kcontext, server);
      if (rem)
      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)
	  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 '",
	      strncat (pop_error, " [server says '",
		       ERROR_MAX - strlen (pop_error) - 1);
		       ERROR_MAX - strlen (pop_error) - 1);
	      strncat (pop_error, err_ret->text.data,
	      strncat (pop_error, err_ret->text.data,
 Lines 1213-1224    Link Here 
	      strncat (pop_error, "']",
	      strncat (pop_error, "']",
		       ERROR_MAX - strlen (pop_error) - 1);
		       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, " [server says '",
	      strncat (pop_error, error_message (rem),
		       ERROR_MAX - strlen (pop_error) - 1);
		       ERROR_MAX - sizeof (KRB_ERROR));
	      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)
	  if (err_ret)
	    krb5_free_error (kcontext, err_ret);
	    krb5_free_error (kcontext, err_ret);
	  krb5_auth_con_free (kcontext, auth_context);
	  krb5_auth_con_free (kcontext, auth_context);