Attachment #148083 for bug #215558




      krb5_free_principal (kcontext, server);
      if (rem)
	{
	  if (err_ret && err_ret->e_data->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->e_data->data,
		       min (ERROR_MAX - strlen (pop_error) - 1,
			    err_ret->e_data->length));
	      strncat (pop_error, "']",
		       ERROR_MAX - strlen (pop_error) - 1);
	    }

Lines 283-289 Link Here

(-)emacs-22.0.97.orig/src/config.in (-2 / +2 lines)
283	#undef HAVE_KERBEROS_KRB_H	283	#undef HAVE_KERBEROS_KRB_H
284		284
285	/* Define to 1 if you have the <krb5.h> header file. */	285	/* Define to 1 if you have the <krb5.h> header file. */
286	#undef HAVE_KRB5_H	286	#define HAVE_KRB5_H
287		287
288	/* Define to 1 if you have the <krb.h> header file. */	288	/* Define to 1 if you have the <krb.h> header file. */
289	#undef HAVE_KRB_H	289	#undef HAVE_KRB_H
Lines 325-331 Link Here
325	#undef HAVE_LIBKRB4	325	#undef HAVE_LIBKRB4
326		326
327	/* Define to 1 if you have the `krb5' library (-lkrb5). */	327	/* Define to 1 if you have the `krb5' library (-lkrb5). */
328	#undef HAVE_LIBKRB5	328	#define HAVE_LIBKRB5
329		329
330	/* Define to 1 if you have the `kstat' library (-lkstat). */	330	/* Define to 1 if you have the `kstat' library (-lkstat). */
331	#undef HAVE_LIBKSTAT	331	#undef HAVE_LIBKSTAT

Return to bug 215558

Lines 1181-1196 Link Here

(-)emacs-22.0.97.orig/lib-src/pop.c (-3 / +3 lines)
1181	krb5_free_principal (kcontext, server);	1181	krb5_free_principal (kcontext, server);
1182	if (rem)	1182	if (rem)
1183	{	1183	{
1184	if (err_ret && err_ret->text.length)	1184	if (err_ret && err_ret->e_data->length)
1185	{	1185	{
1186	strcpy (pop_error, KRB_ERROR);	1186	strcpy (pop_error, KRB_ERROR);
1187	strncat (pop_error, error_message (rem),	1187	strncat (pop_error, error_message (rem),
1188	ERROR_MAX - sizeof (KRB_ERROR));	1188	ERROR_MAX - sizeof (KRB_ERROR));
1189	strncat (pop_error, " [server says '",	1189	strncat (pop_error, " [server says '",
1190	ERROR_MAX - strlen (pop_error) - 1);	1190	ERROR_MAX - strlen (pop_error) - 1);
1191	strncat (pop_error, err_ret->text.data,	1191	strncat (pop_error, err_ret->e_data->data,
1192	min (ERROR_MAX - strlen (pop_error) - 1,	1192	min (ERROR_MAX - strlen (pop_error) - 1,
1193	err_ret->text.length));	1193	err_ret->e_data->length));
1194	strncat (pop_error, "']",	1194	strncat (pop_error, "']",
1195	ERROR_MAX - strlen (pop_error) - 1);	1195	ERROR_MAX - strlen (pop_error) - 1);
1196	}	1196	}