diff options
| author | Mark Murray <markm@FreeBSD.org> | 1998-02-18 11:38:37 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1998-02-18 11:38:37 +0000 |
| commit | 93294191b5f1a3446a52bb2d5ff883e80084fa50 (patch) | |
| tree | b15694f3f139f0550dd07b99a0480f849c8c2c88 /bin | |
| parent | b8cb0537968bc83c04aa9a3a4da31cc7e6823189 (diff) | |
Notes
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/rcp/Makefile | 18 | ||||
| -rw-r--r-- | bin/rcp/rcp.c | 8 |
2 files changed, 14 insertions, 12 deletions
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index 06e2fe0bd260..f6db9bce9616 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,23 +1,25 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.4 1994/09/29 13:06:00 csgr Exp $ +# $Id$ PROG= rcp SRCS= rcp.c util.c +CFLAGS+=-Wall - -.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \ - || defined(MAKE_EBONES)) -SRCS+= kcmd.c krcmd.c -CFLAGS+=-DKERBEROS -DCRYPT +.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) +SRCS+= krcmd.c kcmd.c rcmd_util.c encrypt.c DPADD= ${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 LDADD= -lkrb -ldes DISTRIBUTION= krb +.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd .endif BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg -.PATH: ${.CURDIR}/../../usr.bin/rlogin - .include <bsd.prog.mk> diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 86b5483079ec..162d4b98a1c1 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rcp.c,v 1.8.2.2 1997/06/06 16:11:15 charnier Exp $ + * $Id$ */ #ifndef lint @@ -70,9 +70,9 @@ static char const sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #ifdef KERBEROS #include <des.h> -#include <kerberosIV/krb.h> +#include <krb.h> -#include "../../usr.bin/rlogin/krb.h" +/* #include "../../usr.bin/rlogin/krb.h" */ char dst_realm_buf[REALM_SZ]; char *dest_realm = NULL; @@ -344,7 +344,7 @@ tolocal(argc, argv) if (!(bp = malloc(len))) err(1, NULL); (void)snprintf(bp, len, "exec %s%s%s %s %s", _PATH_CP, - iamrecursive ? " -r" : "", pflag ? " -p" : "", + iamrecursive ? " -PR" : "", pflag ? " -p" : "", argv[i], argv[argc - 1]); if (susystem(bp, userid)) ++errs; |