diff options
-rw-r--r-- | bin/rcp/Makefile | 8 | ||||
-rw-r--r-- | bin/rcp/rcp.c | 1 | ||||
-rw-r--r-- | usr.bin/rlogin/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/rsh/Makefile | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index adaf5c4..d4fa4e8 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -3,17 +3,19 @@ PROG= rcp SRCS= rcp.c util.c +CFLAGS+=-DBINDIR=${BINDIR} .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) -SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c +SRCS+= krcmd.c kcmd.c rcmd_util.c DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES} CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ -I${.CURDIR}/../../kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/lib/roken \ - -I${.CURDIR}/../../crypto/kerberosIV/appl/bsd + -I${.CURDIR}/../../crypto/kerberosIV/appl/bsd \ + -I${.CURDIR} LDADD= -lutil -lkrb -ldes -DISTRIBUTION= krb +DISTRIBUTION= krb4 .PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd .endif diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 6582808..292df37 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -74,6 +74,7 @@ static const char rcsid[] = #ifdef KERBEROS #include <des.h> #include <krb.h> +#include "bsd_locl.h" char dst_realm_buf[REALM_SZ]; char *dest_realm = NULL; diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile index bfaee93..2f07470 100644 --- a/usr.bin/rlogin/Makefile +++ b/usr.bin/rlogin/Makefile @@ -4,12 +4,13 @@ PROG= rlogin SRCS= rlogin.c CFLAGS+=-Wall +CFLAGS+=-I${.CURDIR}/../../libexec/rlogind BINMODE=4555 INSTALLFLAGS=-fschg .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) -SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c +SRCS+= krcmd.c kcmd.c rcmd_util.c DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ -I${.CURDIR}/../../kerberosIV/include \ diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index 29ba01c..63c4919 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -4,9 +4,10 @@ PROG= rsh SRCS= rsh.c CFLAGS+=-Wall +CFLAGS+=-I${.CURDIR}/../../libexec/rlogind .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) -SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c +SRCS+= krcmd.c kcmd.c rcmd_util.c CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ -I${.CURDIR}/../rlogin -I${.CURDIR} -I- \ -I${.CURDIR}/../../kerberosIV/include \ |