summaryrefslogtreecommitdiffstats
path: root/usr.bin/rlogin
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-05-08 00:47:01 +0000
committerdes <des@FreeBSD.org>2002-05-08 00:47:01 +0000
commit84dfbe4ad59351b428fe08c0e87d8cca873fbd90 (patch)
treea9177752eedd56dd4dc85c2061db80a29c678464 /usr.bin/rlogin
parent6a749b9ddc465ad14d6cf3738355ac8204efc6bc (diff)
downloadFreeBSD-src-84dfbe4ad59351b428fe08c0e87d8cca873fbd90.zip
FreeBSD-src-84dfbe4ad59351b428fe08c0e87d8cca873fbd90.tar.gz
Use <paths.h> rather than "pathnames.h", and fix a couple of whitespace nits.
Sponsored by: DARPA, NAI Labs
Diffstat (limited to 'usr.bin/rlogin')
-rw-r--r--usr.bin/rlogin/Makefile1
-rw-r--r--usr.bin/rlogin/rlogin.c10
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 42f0d3e..42d4b81 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -3,7 +3,6 @@
PROG= rlogin
SRCS= rlogin.c
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
BINOWN= root
BINMODE=4555
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index f5c312b..10f07a2 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -1,6 +1,13 @@
/*
* Copyright (c) 1983, 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * Portions of this software were developed for the FreeBSD Project by
+ * ThinkSec AS and NAI Labs, the Security Research Division of Network
+ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+ * ("CBOSS"), as part of the DARPA CHATS research program.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -76,7 +83,6 @@ __FBSDID("$FreeBSD$");
#include <openssl/des.h>
#include <krb.h>
-#include "../../bin/rcp/pathnames.h"
#include "krb.h"
CREDENTIALS cred;
@@ -140,7 +146,7 @@ main(int argc, char *argv[])
#ifdef KERBEROS
char *k;
#endif
- struct sockaddr_storage ss;
+ struct sockaddr_storage ss;
int sslen;
argoff = dflag = Dflag = 0;
OpenPOWER on IntegriCloud