summaryrefslogtreecommitdiffstats
path: root/bin/rcp
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1997-09-28 08:32:59 +0000
committermarkm <markm@FreeBSD.org>1997-09-28 08:32:59 +0000
commit6bef2b9623ffc3363c8a0febe33335007e420944 (patch)
treebdabb70a5efc6fd1b6965bb5aa5885085093318d /bin/rcp
parent93c5769c6c8781226a9ec9ccde10a6b9785f83a4 (diff)
downloadFreeBSD-src-6bef2b9623ffc3363c8a0febe33335007e420944.zip
FreeBSD-src-6bef2b9623ffc3363c8a0febe33335007e420944.tar.gz
Change to use the new KTH Kerberos.
Also make -Wall a bit quieter.
Diffstat (limited to 'bin/rcp')
-rw-r--r--bin/rcp/Makefile18
-rw-r--r--bin/rcp/rcp.c6
2 files changed, 13 insertions, 11 deletions
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 0d300b0..c82eccf 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,23 +1,25 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $Id$
+# $Id: Makefile,v 1.7 1997/02/22 14:05:18 peter Exp $
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 4864368..dd88d37 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.13 1997/05/09 16:00:35 joerg Exp $
+ * $Id: rcp.c,v 1.14 1997/06/06 06:43:19 charnier Exp $
*/
#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;
OpenPOWER on IntegriCloud