diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-05-08 00:47:01 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-05-08 00:47:01 +0000 |
commit | 99b82bb76a54abea9a9c36de152579f5f6a64f03 (patch) | |
tree | a9177752eedd56dd4dc85c2061db80a29c678464 /usr.bin/rsh | |
parent | 57b7631cb8d99125bfc0e2a1747cd0cdf3779a58 (diff) | |
download | src-99b82bb76a54abea9a9c36de152579f5f6a64f03.tar.gz src-99b82bb76a54abea9a9c36de152579f5f6a64f03.zip |
Use <paths.h> rather than "pathnames.h", and fix a couple of whitespace nits.
Sponsored by: DARPA, NAI Labs
Notes
Notes:
svn path=/head/; revision=96196
Diffstat (limited to 'usr.bin/rsh')
-rw-r--r-- | usr.bin/rsh/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/rsh/pathnames.h | 36 | ||||
-rw-r--r-- | usr.bin/rsh/rsh.c | 13 |
3 files changed, 10 insertions, 42 deletions
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index 87691870e70c..844c1f225b13 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -7,8 +7,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rlogind .if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) SRCS+= krcmd.c kcmd.c rcmd_util.c -CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \ - -I${.CURDIR}/../rlogin -I${.CURDIR} -I- \ +CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H -I- \ -I${.CURDIR}/../../kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/include \ -I${.CURDIR}/../../crypto/kerberosIV/lib/roken \ diff --git a/usr.bin/rsh/pathnames.h b/usr.bin/rsh/pathnames.h deleted file mode 100644 index 16753c8fd62c..000000000000 --- a/usr.bin/rsh/pathnames.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 - */ - -#define _PATH_RLOGIN "/usr/bin/rlogin" diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index 44a4e953f78a..394a19b96e36 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -1,6 +1,13 @@ /*- * Copyright (c) 1983, 1990, 1993, 1994 * 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 @@ -57,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> #include <libutil.h> +#include <paths.h> #include <pwd.h> #include <signal.h> #include <stdio.h> @@ -65,8 +73,6 @@ __FBSDID("$FreeBSD$"); #include <unistd.h> #include <err.h> -#include "pathnames.h" - #ifdef KERBEROS #include <openssl/des.h> #include <krb.h> @@ -313,7 +319,7 @@ try_connect: if (pid < 0) err(1, "fork"); } - else + else (void)shutdown(rem, 1); #ifdef KERBEROS @@ -497,4 +503,3 @@ usage(void) #endif exit(1); } - |