Use <paths.h> rather than "pathnames.h", and fix a couple of whitespace nits.
Sponsored by: DARPA, NAI Labs
This commit is contained in:
parent
57b7631cb8
commit
99b82bb76a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96196
@ -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"
|
|
@ -1,6 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1990, 1992, 1993
|
* Copyright (c) 1983, 1990, 1992, 1993
|
||||||
* The Regents of the University of California. All rights reserved.
|
* 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
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@ -61,6 +68,7 @@ static const char rcsid[] =
|
|||||||
#include <libutil.h>
|
#include <libutil.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
|
#include <paths.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@ -69,7 +77,6 @@ static const char rcsid[] =
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "pathnames.h"
|
|
||||||
#include "extern.h"
|
#include "extern.h"
|
||||||
|
|
||||||
#ifdef KERBEROS
|
#ifdef KERBEROS
|
||||||
@ -80,7 +87,7 @@ static const char rcsid[] =
|
|||||||
char dst_realm_buf[REALM_SZ];
|
char dst_realm_buf[REALM_SZ];
|
||||||
char *dest_realm = NULL;
|
char *dest_realm = NULL;
|
||||||
int use_kerberos = 1;
|
int use_kerberos = 1;
|
||||||
CREDENTIALS cred;
|
CREDENTIALS cred;
|
||||||
Key_schedule schedule;
|
Key_schedule schedule;
|
||||||
extern char *krb_realmofhost();
|
extern char *krb_realmofhost();
|
||||||
#ifdef CRYPT
|
#ifdef CRYPT
|
||||||
@ -429,7 +436,7 @@ source(int argc, char *argv[])
|
|||||||
char *last, *name, buf[BUFSIZ];
|
char *last, *name, buf[BUFSIZ];
|
||||||
|
|
||||||
for (indx = 0; indx < argc; ++indx) {
|
for (indx = 0; indx < argc; ++indx) {
|
||||||
name = argv[indx];
|
name = argv[indx];
|
||||||
if ((fd = open(name, O_RDONLY, 0)) < 0)
|
if ((fd = open(name, O_RDONLY, 0)) < 0)
|
||||||
goto syserr;
|
goto syserr;
|
||||||
if (fstat(fd, &stb)) {
|
if (fstat(fd, &stb)) {
|
||||||
|
@ -1,40 +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/4/93
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <paths.h>
|
|
||||||
|
|
||||||
#define _PATH_LOGIN "/usr/bin/login"
|
|
||||||
#define _PATH_RLOGIN "/usr/bin/rlogin"
|
|
@ -1,6 +1,13 @@
|
|||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1983, 1988, 1989, 1993
|
* Copyright (c) 1983, 1988, 1989, 1993
|
||||||
* The Regents of the University of California. All rights reserved.
|
* 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
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@ -72,13 +79,13 @@ static const char rcsid[] =
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <libutil.h>
|
#include <libutil.h>
|
||||||
|
#include <paths.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "pathnames.h"
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef TIOCPKT_WINDOW
|
#ifndef TIOCPKT_WINDOW
|
||||||
@ -177,7 +184,7 @@ main(int argc, char *argv[])
|
|||||||
if (no_delay &&
|
if (no_delay &&
|
||||||
setsockopt(0, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
|
setsockopt(0, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
|
||||||
syslog(LOG_WARNING, "setsockopt (TCP_NODELAY): %m");
|
syslog(LOG_WARNING, "setsockopt (TCP_NODELAY): %m");
|
||||||
if (from.su_family == AF_INET)
|
if (from.su_family == AF_INET)
|
||||||
{
|
{
|
||||||
on = IPTOS_LOWDELAY;
|
on = IPTOS_LOWDELAY;
|
||||||
if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
|
if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0)
|
||||||
@ -238,7 +245,7 @@ doit(int f, union sockunion *fromp)
|
|||||||
}
|
}
|
||||||
#ifdef IP_OPTIONS
|
#ifdef IP_OPTIONS
|
||||||
if (fromp->su_family == AF_INET)
|
if (fromp->su_family == AF_INET)
|
||||||
{
|
{
|
||||||
u_char optbuf[BUFSIZ/3];
|
u_char optbuf[BUFSIZ/3];
|
||||||
int optsize = sizeof(optbuf), ipproto, i;
|
int optsize = sizeof(optbuf), ipproto, i;
|
||||||
struct protoent *ip;
|
struct protoent *ip;
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
PROG= rlogin
|
PROG= rlogin
|
||||||
SRCS= rlogin.c
|
SRCS= rlogin.c
|
||||||
CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
|
|
||||||
|
|
||||||
BINOWN= root
|
BINOWN= root
|
||||||
BINMODE=4555
|
BINMODE=4555
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1990, 1993
|
* Copyright (c) 1983, 1990, 1993
|
||||||
* The Regents of the University of California. All rights reserved.
|
* 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
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@ -76,7 +83,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <openssl/des.h>
|
#include <openssl/des.h>
|
||||||
#include <krb.h>
|
#include <krb.h>
|
||||||
|
|
||||||
#include "../../bin/rcp/pathnames.h"
|
|
||||||
#include "krb.h"
|
#include "krb.h"
|
||||||
|
|
||||||
CREDENTIALS cred;
|
CREDENTIALS cred;
|
||||||
@ -140,7 +146,7 @@ main(int argc, char *argv[])
|
|||||||
#ifdef KERBEROS
|
#ifdef KERBEROS
|
||||||
char *k;
|
char *k;
|
||||||
#endif
|
#endif
|
||||||
struct sockaddr_storage ss;
|
struct sockaddr_storage ss;
|
||||||
int sslen;
|
int sslen;
|
||||||
|
|
||||||
argoff = dflag = Dflag = 0;
|
argoff = dflag = Dflag = 0;
|
||||||
|
@ -7,8 +7,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
|
|||||||
|
|
||||||
.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
|
.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
|
||||||
SRCS+= krcmd.c kcmd.c rcmd_util.c
|
SRCS+= krcmd.c kcmd.c rcmd_util.c
|
||||||
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
|
CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H -I- \
|
||||||
-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \
|
|
||||||
-I${.CURDIR}/../../kerberosIV/include \
|
-I${.CURDIR}/../../kerberosIV/include \
|
||||||
-I${.CURDIR}/../../crypto/kerberosIV/include \
|
-I${.CURDIR}/../../crypto/kerberosIV/include \
|
||||||
-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
|
-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
|
||||||
|
@ -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"
|
|
@ -1,6 +1,13 @@
|
|||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1983, 1990, 1993, 1994
|
* Copyright (c) 1983, 1990, 1993, 1994
|
||||||
* The Regents of the University of California. All rights reserved.
|
* 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
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions
|
* modification, are permitted provided that the following conditions
|
||||||
@ -57,6 +64,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <libutil.h>
|
#include <libutil.h>
|
||||||
|
#include <paths.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@ -65,8 +73,6 @@ __FBSDID("$FreeBSD$");
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
|
|
||||||
#include "pathnames.h"
|
|
||||||
|
|
||||||
#ifdef KERBEROS
|
#ifdef KERBEROS
|
||||||
#include <openssl/des.h>
|
#include <openssl/des.h>
|
||||||
#include <krb.h>
|
#include <krb.h>
|
||||||
@ -313,7 +319,7 @@ main(int argc, char *argv[])
|
|||||||
if (pid < 0)
|
if (pid < 0)
|
||||||
err(1, "fork");
|
err(1, "fork");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
(void)shutdown(rem, 1);
|
(void)shutdown(rem, 1);
|
||||||
|
|
||||||
#ifdef KERBEROS
|
#ifdef KERBEROS
|
||||||
@ -497,4 +503,3 @@ usage(void)
|
|||||||
#endif
|
#endif
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user