===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/passwd/Makefile	2000/09/03 18:41:18	1.20
--- src/usr.bin/passwd/Makefile	2001/05/25 12:20:48	1.21
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.20 2000/09/03 18:41:18 espie Exp $
  
  .include <bsd.own.mk>
  
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.21 2001/05/25 12:20:48 hin Exp $
  
  .include <bsd.own.mk>
  
***************
*** 16,27 ****
  
  .include <bsd.own.mk>	# For Kerberos
  
! .if (${KERBEROS5:L} == "yes")
  #SRCS+= krb5_passwd.c XXX fix the /tmp/tkt_cpw_%d race first + others
! CFLAGS+= -DKERBEROS5
! DPADD+=	${LIBKRB5} ${LIBCRYPTO}
! LDADD+=	-lkrb5 -lcrypto
! .elif (${KERBEROS:L} == "yes")
  .PATH:  ${.CURDIR}/../rlogin
  SRCS+= new_pwd.c krb_passwd.c des_rw.c
  CFLAGS+= -DKERBEROS
--- 16,29 ----
  
  .include <bsd.own.mk>	# For Kerberos
  
! #.if (${KERBEROS5:L} == "yes")
  #SRCS+= krb5_passwd.c XXX fix the /tmp/tkt_cpw_%d race first + others
! #CFLAGS+= -DKERBEROS5
! #DPADD+=	${LIBKRB5} ${LIBCRYPTO}
! #LDADD+=	-lkrb5 -lcrypto
! #.endif
! 
! .if (${KERBEROS:L} == "yes")
  .PATH:  ${.CURDIR}/../rlogin
  SRCS+= new_pwd.c krb_passwd.c des_rw.c
  CFLAGS+= -DKERBEROS