procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(socket_connection): Add conditionals for HAVE_KRB5_ERROR_TEXT and

Browse source 
HAVE_KRB5_ERROR_E_TEXT to support compilation with MIT Kerberos and
Heimdal, respectively.
This commit is contained in:
Chong Yidong 2008-08-05 23:44:48 +00:00
parent 39b8bb9b73
commit 5fe92a72fc
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib-src/pop.c
View file

@ -1254,11 +1254,12 @@ socket_connection (host, flags)
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 @@ socket_connection (host, flags)
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);