Index: crypto/heimdal/appl/su/su.c
===================================================================
RCS file: /home/ncvs/src/crypto/heimdal/appl/su/su.c,v
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.3 su.c
--- crypto/heimdal/appl/su/su.c	30 Apr 2002 14:49:14 -0000	1.1.1.1.2.3
+++ crypto/heimdal/appl/su/su.c	18 May 2002 21:13:26 -0000
@@ -174,12 +174,12 @@
 				  NULL);
     else
 	ret = krb5_make_principal(context, &p, NULL, 
-				  su_info->pw_name,
+				  login_name,
 				  NULL);
     if(ret)
 	return 1;
 	
-    if(su_info->pw_uid != 0 || krb5_kuserok(context, p, su_info->pw_name)) {
+    if(/*su_info->pw_uid != 0 ||*/ krb5_kuserok(context, p, su_info->pw_name)) {
 	ret = krb5_cc_gen_new(context, &krb5_mcc_ops, &ccache);
 	if(ret) {
 #if 1
@@ -347,7 +347,7 @@
       (kerberos_error=krb5_verify(login_info, su_info, kerberos_instance)) == 0)
 	ok++;
 
-    if(ok == 0 && login_info->pw_uid && verify_unix(su_info) != 0) {
+    if(ok == 0 && login_info->pw_uid /* && verify_unix(su_info) != 0 */) {
 	printf("Sorry!\n");
 	exit(1);
     }
Index: kerberos5/usr.bin/k5su/Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/usr.bin/k5su/Makefile,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 Makefile
--- kerberos5/usr.bin/k5su/Makefile	15 May 2002 12:51:30 -0000	1.1.2.5
+++ kerberos5/usr.bin/k5su/Makefile	15 May 2002 23:51:54 -0000
@@ -23,9 +23,7 @@
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
-.if defined(ENABLE_SUID_K5SU)
 BINMODE=4555
-.endif
 INSTALLFLAGS=-fschg
 
 .include <bsd.prog.mk>