diff -urN postgresql-7.1beta5/configure postgresql-7.1beta5-heimdal/configure
--- postgresql-7.1beta5/configure	Fri Feb 23 21:11:49 2001
+++ postgresql-7.1beta5-heimdal/configure	Mon Feb 26 03:31:10 2001
@@ -4361,7 +4361,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lk5crypto  $LIBS"
+LIBS="-lkrb5  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 4367 "configure"
 #include "confdefs.h"
@@ -4395,8 +4395,7 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lk5crypto $LIBS"
-
+  
 else
   echo "$ac_t""no" 1>&6
 { echo "configure: error: library 'crypto' or 'k5crypto' is required for Kerberos 5" 1>&2; exit 1; }
diff -urN postgresql-7.1beta5/src/backend/libpq/auth.c postgresql-7.1beta5-heimdal/src/backend/libpq/auth.c
--- postgresql-7.1beta5/src/backend/libpq/auth.c	Mon Jan 29 05:53:37 2001
+++ postgresql-7.1beta5-heimdal/src/backend/libpq/auth.c	Mon Feb 26 09:21:50 2001
@@ -273,7 +273,7 @@
 	 * I have no idea why this is considered necessary.
 	 */
     retval = krb5_unparse_name(pg_krb5_context, 
-							   ticket->enc_part2->client, &kusername);
+							   ticket->client, &kusername);
 	if (retval) {
 		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 "pg_krb5_recvauth: krb5_unparse_name returned"
diff -urN postgresql-7.1beta5/src/interfaces/libpq/fe-auth.c postgresql-7.1beta5-heimdal/src/interfaces/libpq/fe-auth.c
--- postgresql-7.1beta5/src/interfaces/libpq/fe-auth.c	Fri Feb 23 21:12:25 2001
+++ postgresql-7.1beta5-heimdal/src/interfaces/libpq/fe-auth.c	Mon Feb 26 10:28:21 2001
@@ -393,7 +393,7 @@
 		if (retval == KRB5_SENDAUTH_REJECTED && err_ret) {
 			snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 					 "pg_krb5_sendauth: authentication rejected: \"%*s\"",
-					 err_ret->text.length, err_ret->text.data);
+					 strlen((char *)(err_ret->e_text)), err_ret->e_text);
 		}
 		else {
 			snprintf(PQerrormsg, PQERRORMSG_LENGTH,