diff options
Diffstat (limited to 'bin/rcp')
| -rw-r--r-- | bin/rcp/pathnames.h | 42 | ||||
| -rw-r--r-- | bin/rcp/rcp.c | 13 |
2 files changed, 10 insertions, 45 deletions
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h deleted file mode 100644 index b1f0ec083179..000000000000 --- a/bin/rcp/pathnames.h +++ /dev/null @@ -1,42 +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) 5/31/93 - * $FreeBSD$ - */ - -#include <paths.h> - -#define _PATH_CP "/bin/cp" -#define _PATH_RCP "/bin/rcp" -#define _PATH_RLOGIN "/usr/bin/rlogin" -#define _PATH_RSH "/usr/bin/rsh" diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 3cc6ceb86e02..8f0a01d4c62c 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,6 +1,13 @@ /* * Copyright (c) 1983, 1990, 1992, 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 @@ -61,6 +68,7 @@ static const char rcsid[] = #include <libutil.h> #include <limits.h> #include <netdb.h> +#include <paths.h> #include <pwd.h> #include <signal.h> #include <stdio.h> @@ -69,7 +77,6 @@ static const char rcsid[] = #include <string.h> #include <unistd.h> -#include "pathnames.h" #include "extern.h" #ifdef KERBEROS @@ -80,7 +87,7 @@ static const char rcsid[] = char dst_realm_buf[REALM_SZ]; char *dest_realm = NULL; int use_kerberos = 1; -CREDENTIALS cred; +CREDENTIALS cred; Key_schedule schedule; extern char *krb_realmofhost(); #ifdef CRYPT @@ -429,7 +436,7 @@ source(int argc, char *argv[]) char *last, *name, buf[BUFSIZ]; for (indx = 0; indx < argc; ++indx) { - name = argv[indx]; + name = argv[indx]; if ((fd = open(name, O_RDONLY, 0)) < 0) goto syserr; if (fstat(fd, &stb)) { |