Index: stable/3/kerberosIV/Makefile =================================================================== --- stable/3/kerberosIV/Makefile (revision 43183) +++ stable/3/kerberosIV/Makefile (revision 43184) @@ -1,43 +1,63 @@ # $Id$ SUBDIR= include lib libexec usr.bin usr.sbin SDIR= ${.CURDIR}/.. -CODAI= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ +CODAI= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \ + ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \ + ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all install + +CODAIN= ${MAKE} ${MFLAGS} cleandir && \ + ${MAKE} ${MFLAGS} obj && \ ${MAKE} ${MFLAGS} depend all install -CODAD= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir; \ - ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj; \ +CODAD= ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \ + ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \ ${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all distribute # These are the programs which depend on kerberos kprog: cd ${SDIR}/bin/rcp; ${CODAI} cd ${SDIR}/gnu/usr.bin/cvs; ${CODAI} cd ${SDIR}/libexec/rlogind; ${CODAI} cd ${SDIR}/libexec/rshd; ${CODAI} cd ${SDIR}/usr.bin/login; ${CODAI} cd ${SDIR}/usr.bin/passwd; ${CODAI} cd ${SDIR}/usr.bin/rlogin; ${CODAI} cd ${SDIR}/usr.bin/rsh; ${CODAI} cd ${SDIR}/usr.bin/su; ${CODAI} cd ${SDIR}/sbin/dump; ${CODAI} cd ${SDIR}/sbin/restore; ${CODAI} +# These are the programs which depend on kerberos +# This target us used to rebuild these programs WITHOUT kerberos +dekerberise: + cd ${SDIR}/bin/rcp; ${CODAIN} + cd ${SDIR}/gnu/usr.bin/cvs; ${CODAIN} + cd ${SDIR}/libexec/rlogind; ${CODAIN} + cd ${SDIR}/libexec/rshd; ${CODAIN} + cd ${SDIR}/usr.bin/login; ${CODAIN} + cd ${SDIR}/usr.bin/passwd; ${CODAIN} + cd ${SDIR}/usr.bin/rlogin; ${CODAIN} + cd ${SDIR}/usr.bin/rsh; ${CODAIN} + cd ${SDIR}/usr.bin/su; ${CODAIN} + cd ${SDIR}/sbin/dump; ${CODAIN} + cd ${SDIR}/sbin/restore; ${CODAIN} + bootstrap: cleandir obj depend all install kprog help-distribute: distribute cd ${SDIR}/bin/rcp; ${CODAD} + cd ${SDIR}/gnu/usr.bin/cvs; ${CODAD} cd ${SDIR}/libexec/rlogind; ${CODAD} cd ${SDIR}/libexec/rshd; ${CODAD} cd ${SDIR}/usr.bin/login; ${CODAD} cd ${SDIR}/usr.bin/passwd; ${CODAD} cd ${SDIR}/usr.bin/rlogin; ${CODAD} cd ${SDIR}/usr.bin/rsh; ${CODAD} cd ${SDIR}/usr.bin/su; ${CODAD} cd ${SDIR}/sbin/dump; ${CODAD} cd ${SDIR}/sbin/restore; ${CODAD} .include Index: stable/3/kerberosIV/libexec/kpropd/Makefile =================================================================== --- stable/3/kerberosIV/libexec/kpropd/Makefile (revision 43183) +++ stable/3/kerberosIV/libexec/kpropd/Makefile (revision 43184) @@ -1,18 +1,18 @@ # $Id$ PROG= kpropd MAN8= ${KRB4DIR}/man/kpropd.8 SRCS= kpropd.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/slave Index: stable/3/kerberosIV/libexec/telnetd/Makefile =================================================================== --- stable/3/kerberosIV/libexec/telnetd/Makefile (revision 43183) +++ stable/3/kerberosIV/libexec/telnetd/Makefile (revision 43184) @@ -1,22 +1,23 @@ # $Id$ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. PROG= telnetd MAN8= telnetd.8 CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DAUTHENTICATION -DENCRYPTION \ -I${TELNETDIR} SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} \ + ${LIBCRYPT} LDADD= -lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ - -L${KRBOBJDIR} -lkrb + -L${KRBOBJDIR} -lkrb -lcrypt .include .PATH: ${TELNETDIR}/telnetd Index: stable/3/kerberosIV/usr.bin/kdestroy/Makefile =================================================================== --- stable/3/kerberosIV/usr.bin/kdestroy/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.bin/kdestroy/Makefile (revision 43184) @@ -1,19 +1,19 @@ # $Id$ PROG= kdestroy MAN1= ${KRB4DIR}/man/kdestroy.1 SRCS= kdestroy.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kuser LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/kuser Index: stable/3/kerberosIV/usr.bin/klist/Makefile =================================================================== --- stable/3/kerberosIV/usr.bin/klist/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.bin/klist/Makefile (revision 43184) @@ -1,19 +1,19 @@ # $Id$ PROG= klist MAN1= ${KRB4DIR}/man/klist.1 SRCS= klist.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kuser LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} + -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKAFS} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/kuser Index: stable/3/kerberosIV/usr.bin/telnet/Makefile =================================================================== --- stable/3/kerberosIV/usr.bin/telnet/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.bin/telnet/Makefile (revision 43184) @@ -1,17 +1,18 @@ # $Id$ PROG= telnet CFLAGS+= -DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ -DENCRYPTION -DAUTHENTICATION -DKRB4 \ -I${TELNETDIR} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} -LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes -L${KRBOBJDIR} -lkrb +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBDES} ${LIBKRB} ${LIBCRYPT} +LDADD= -ltermcap -L${TELNETOBJDIR} -ltelnet -ldes \ + -L${KRBOBJDIR} -lkrb -lcrypt .include .PATH: ${TELNETDIR}/telnet Index: stable/3/kerberosIV/usr.sbin/ext_srvtab/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/ext_srvtab/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/ext_srvtab/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= ext_srvtab MAN8= ${KRB4DIR}/man/ext_srvtab.8 SRCS= ext_srvtab.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/admin \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/admin Index: stable/3/kerberosIV/usr.sbin/kadmind/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kadmind/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kadmind/Makefile (revision 43184) @@ -1,27 +1,27 @@ # $Id$ PROG= kadmind MAN8= ${KRB4DIR}/man/kadmind.8 SRCS= kadm_server.c kadm_funcs.c admin_server.c kadm_ser_wrap.c \ pw_check.c ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/sl \ -I${KRB4DIR}/lib/acl \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kadmin \ -I${KADMOBJDIR} \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \ -L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -lcom_err + -ldes -lcom_err -lcrypt DPADD= ${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} ${LIBCOM_ERR} + ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/kadmin Index: stable/3/kerberosIV/usr.sbin/kdb_destroy/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kdb_destroy/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kdb_destroy/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= kdb_destroy MAN8= ${KRB4DIR}/man/kdb_destroy.8 SRCS= kdb_destroy.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT} .include .PATH: ${KRB4DIR}/admin Index: stable/3/kerberosIV/usr.sbin/kdb_edit/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kdb_edit/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kdb_edit/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= kdb_edit MAN8= ${KRB4DIR}/man/kdb_edit.8 SRCS= kdb_edit.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/admin Index: stable/3/kerberosIV/usr.sbin/kdb_init/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kdb_init/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kdb_init/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= kdb_init MAN8= ${KRB4DIR}/man/kdb_init.8 SRCS= kdb_init.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/admin Index: stable/3/kerberosIV/usr.sbin/kdb_util/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kdb_util/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kdb_util/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= kdb_util MAN8= ${KRB4DIR}/man/kdb_util.8 SRCS= kdb_util.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/admin Index: stable/3/kerberosIV/usr.sbin/kerberos/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kerberos/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kerberos/Makefile (revision 43184) @@ -1,24 +1,23 @@ # $Id$ PROG= kerberos MAN1= ${KRB4DIR}/man/kerberos.1 MAN5= ${KRB4DIR}/man/krb.conf.5 ${KRB4DIR}/man/krb.realms.5 \ ${KRB4DIR}/man/krb.equiv.5 MAN8= ${KRB4DIR}/man/kerberos.8 SRCS= kerberos.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KADMOBJDIR} \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/server Index: stable/3/kerberosIV/usr.sbin/kip/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kip/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kip/Makefile (revision 43184) @@ -1,17 +1,17 @@ # $Id$ PROG= kip NOMAN= true SRCS= kip.c common.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/kadmin \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/appl/kip Index: stable/3/kerberosIV/usr.sbin/kprop/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kprop/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kprop/Makefile (revision 43184) @@ -1,18 +1,18 @@ # $Id$ PROG= kprop MAN8= ${KRB4DIR}/man/kprop.8 SRCS= kprop.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/slave Index: stable/3/kerberosIV/usr.sbin/kstash/Makefile =================================================================== --- stable/3/kerberosIV/usr.sbin/kstash/Makefile (revision 43183) +++ stable/3/kerberosIV/usr.sbin/kstash/Makefile (revision 43184) @@ -1,20 +1,19 @@ # $Id$ PROG= kstash MAN8= ${KRB4DIR}/man/kstash.8 SRCS= kstash.c CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include .PATH: ${KRB4DIR}/admin