Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up import, RCS ids

Browse Source
This commit is contained in:
cgd 1994-06-05 13:49:01 +00:00
parent ffde2d4a28
commit 13514eadce
4 changed files with 118 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libexec/rlogind/Makefile
View File

@ -1,11 +1,12 @@
# from: @(#)Makefile 5.9 (Berkeley) 9/27/90
# $Id: Makefile,v 1.2 1993/08/01 05:39:03 mycroft Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $Id: Makefile,v 1.3 1994/06/05 13:49:01 cgd Exp $
PROG= rlogind
SRCS= rlogind.c
CFLAGS+=-DKERBEROS -DCRYPT
SRCS= rlogind.c des_rw.c
MAN8= rlogind.0
DPADD= ${LIBUTIL}
LDADD= -lutil
DPADD= ${LIBUTIL} ${LIBKRB} ${LIBDES}
LDADD= -lutil -lkrb -ldes
.PATH: ${.CURDIR}/../../usr.bin/rlogin
.include <bsd.prog.mk>

8
libexec/rlogind/pathnames.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
* 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
@ -30,8 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)pathnames.h 5.4 (Berkeley) 6/1/90
* $Id: pathnames.h,v 1.2 1993/08/01 18:29:51 mycroft Exp $
* from: @(#)pathnames.h 8.1 (Berkeley) 6/4/93
* $Id: pathnames.h,v 1.3 1994/06/05 13:49:04 cgd Exp $
*/
#include <paths.h>

10
libexec/rlogind/rlogind.8
View File

@ -1,5 +1,5 @@
.\" Copyright (c) 1983, 1989, 1991 The Regents of the University of California.
.\" All rights reserved.
.\" Copyright (c) 1983, 1989, 1991, 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
@ -29,10 +29,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rlogind.8 6.12 (Berkeley) 3/16/91
.\" $Id: rlogind.8,v 1.2 1993/08/01 07:39:59 mycroft Exp $
.\" from: @(#)rlogind.8 8.1 (Berkeley) 6/4/93
.\" $Id: rlogind.8,v 1.3 1994/06/05 13:49:04 cgd Exp $
.\"
.Dd March 16, 1991
.Dd June 4, 1993
.Dt RLOGIND 8
.Os BSD 4.2
.Sh NAME

225
libexec/rlogind/rlogind.c
View File

@ -1,6 +1,6 @@
/*-
* Copyright (c) 1983, 1988, 1989 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1983, 1988, 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
@ -32,23 +32,16 @@
*/
#ifndef lint
char copyright[] =
"@(#) Copyright (c) 1983, 1988, 1989 The Regents of the University of California.\n\
All rights reserved.\n";
static char copyright[] =
"@(#) Copyright (c) 1983, 1988, 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*static char sccsid[] = "from: @(#)rlogind.c 5.53 (Berkeley) 4/20/91";*/
static char rcsid[] = "$Id: rlogind.c,v 1.4 1994/06/02 19:16:37 pk Exp $";
/* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$Id: rlogind.c,v 1.5 1994/06/05 13:49:05 cgd Exp $";
#endif /* not lint */
#ifdef KERBEROS
/* From:
* $Source: /cvsroot/src/libexec/rlogind/rlogind.c,v $
* $Header: /cvsroot/src/libexec/rlogind/rlogind.c,v 1.4 1994/06/02 19:16:37 pk Exp $
*/
#endif
/*
* remote login server:
* \0
@ -112,15 +105,27 @@ int check_all = 0;
struct passwd *pwd;
void doit __P((int, struct sockaddr_in *));
int control __P((int, char *, int));
void protocol __P((int, int));
void cleanup __P((int));
void fatal __P((int, char *, int));
int do_rlogin __P((struct sockaddr_in *));
void getstr __P((char *, int, char *));
void setup_term __P((int));
int do_krb_login __P((struct sockaddr_in *));
void usage __P((void));
int local_domain __P((char *));
char *topdomain __P((char *));
int
main(argc, argv)
int argc;
char **argv;
char *argv[];
{
extern int opterr, optind;
extern int __check_rhosts_file;
int ch;
int on = 1, fromlen;
struct sockaddr_in from;
int ch, fromlen, on;
openlog("rlogind", LOG_PID | LOG_CONS, LOG_AUTH);
@ -168,6 +173,7 @@ main(argc, argv)
syslog(LOG_ERR,"Can't get peer name of remote host: %m");
fatal(STDERR_FILENO, "Can't get peer name of remote host", 1);
}
on = 1;
if (keepalive &&
setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0)
syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
@ -178,24 +184,22 @@ main(argc, argv)
}
int child;
void cleanup();
int netf;
char line[MAXPATHLEN];
int confirmed;
extern char *inet_ntoa();
struct winsize win = { 0, 0, 0, 0 };
void
doit(f, fromp)
int f;
struct sockaddr_in *fromp;
{
int i, master, pid, on = 1;
int authenticated = 0, hostok = 0;
int master, pid, on = 1;
int authenticated = 0;
register struct hostent *hp;
char remotehost[2 * MAXHOSTNAMELEN + 1];
struct hostent hostent;
char hostname[2 * MAXHOSTNAMELEN + 1];
char c;
alarm(60);
@ -211,44 +215,15 @@ doit(f, fromp)
alarm(0);
fromp->sin_port = ntohs((u_short)fromp->sin_port);
hp = gethostbyaddr((char *)&fromp->sin_addr, sizeof(struct in_addr),
fromp->sin_family);
if (hp == 0) {
/*
* Only the name is used below.
*/
strcpy(remotehost, inet_ntoa(fromp->sin_addr));
hostok++;
} else if (check_all || local_domain(hp->h_name)) {
/*
* If name returned by gethostbyaddr is in our domain,
* attempt to verify that we haven't been fooled by someone
* in a remote net; look up the name and check that this
* address corresponds to the name.
*/
strncpy(remotehost, hp->h_name, sizeof(remotehost) - 1);
remotehost[sizeof(remotehost) - 1] = 0;
hp = gethostbyname(remotehost);
if (hp)
for (; hp->h_addr_list[0]; hp->h_addr_list++)
if (!bcmp(hp->h_addr_list[0], (caddr_t)&fromp->sin_addr,
sizeof(fromp->sin_addr))) {
strncpy(remotehost, hp->h_name,
sizeof(remotehost) - 1);
remotehost[sizeof(remotehost) - 1] = 0;
hostok++;
break;
}
} else {
strncpy(remotehost, hp->h_name, sizeof(remotehost) - 1);
remotehost[sizeof(remotehost) - 1] = 0;
hostok++;
}
fromp->sin_family);
if (hp)
(void)strcpy(hostname, hp->h_name);
else
(void)strcpy(hostname, inet_ntoa(fromp->sin_addr));
#ifdef KERBEROS
if (use_kerberos) {
if (!hostok)
fatal(f, "rlogind: Host address mismatch.", 0);
retval = do_krb_login(remotehost, fromp);
retval = do_krb_login(fromp);
if (retval == 0)
authenticated++;
else if (retval > 0)
@ -258,42 +233,43 @@ doit(f, fromp)
} else
#endif
{
if (fromp->sin_family != AF_INET ||
fromp->sin_port >= IPPORT_RESERVED ||
fromp->sin_port < IPPORT_RESERVED/2) {
syslog(LOG_NOTICE, "Connection from %s on illegal port",
inet_ntoa(fromp->sin_addr));
fatal(f, "Permission denied", 0);
}
if (fromp->sin_family != AF_INET ||
fromp->sin_port >= IPPORT_RESERVED ||
fromp->sin_port < IPPORT_RESERVED/2) {
syslog(LOG_NOTICE, "Connection from %s on illegal port",
inet_ntoa(fromp->sin_addr));
fatal(f, "Permission denied", 0);
}
#ifdef IP_OPTIONS
{
u_char optbuf[BUFSIZ/3], *cp;
char lbuf[BUFSIZ], *lp;
int optsize = sizeof(optbuf), ipproto;
struct protoent *ip;
{
u_char optbuf[BUFSIZ/3], *cp;
char lbuf[BUFSIZ], *lp;
int optsize = sizeof(optbuf), ipproto;
struct protoent *ip;
if ((ip = getprotobyname("ip")) != NULL)
ipproto = ip->p_proto;
else
ipproto = IPPROTO_IP;
if (getsockopt(0, ipproto, IP_OPTIONS, (char *)optbuf,
&optsize) == 0 && optsize != 0) {
lp = lbuf;
for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
sprintf(lp, " %2.2x", *cp);
syslog(LOG_NOTICE,
"Connection received using IP options (ignored):%s",
lbuf);
if (setsockopt(0, ipproto, IP_OPTIONS,
(char *)NULL, optsize) != 0) {
syslog(LOG_ERR, "setsockopt IP_OPTIONS NULL: %m");
exit(1);
}
}
}
if ((ip = getprotobyname("ip")) != NULL)
ipproto = ip->p_proto;
else
ipproto = IPPROTO_IP;
if (getsockopt(0, ipproto, IP_OPTIONS, (char *)optbuf,
&optsize) == 0 && optsize != 0) {
lp = lbuf;
for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3)
sprintf(lp, " %2.2x", *cp);
syslog(LOG_NOTICE,
"Connection received using IP options (ignored):%s",
lbuf);
if (setsockopt(0, ipproto, IP_OPTIONS,
(char *)NULL, optsize) != 0) {
syslog(LOG_ERR,
"setsockopt IP_OPTIONS NULL: %m");
exit(1);
}
}
}
#endif
if (do_rlogin(remotehost) == 0 && hostok)
authenticated++;
if (do_rlogin(fromp) == 0)
authenticated++;
}
if (confirmed == 0) {
write(f, "", 1);
@ -302,14 +278,9 @@ doit(f, fromp)
#ifdef KERBEROS
#ifdef CRYPT
if (doencrypt)
(void) des_write(f, SECURE_MESSAGE, sizeof(SECURE_MESSAGE));
(void) des_write(f, SECURE_MESSAGE, sizeof(SECURE_MESSAGE) - 1);
#endif
if (use_kerberos == 0)
#endif
if (!authenticated && !hostok)
write(f, "rlogind: Host address mismatch.\r\n",
sizeof("rlogind: Host address mismatch.\r\n") - 1);
netf = f;
pid = forkpty(&master, line, NULL, &win);
@ -320,7 +291,7 @@ doit(f, fromp)
fatal(f, "Forkpty", 1);
}
if (pid == 0) {
if (f > 2) /* f should always be 0, but... */
if (f > 2) /* f should always be 0, but... */
(void) close(f);
setup_term(0);
if (authenticated) {
@ -329,14 +300,14 @@ doit(f, fromp)
syslog(LOG_INFO|LOG_AUTH,
"ROOT Kerberos login from %s.%s@%s on %s\n",
kdata->pname, kdata->pinst, kdata->prealm,
remotehost);
hostname);
#endif
execl(_PATH_LOGIN, "login", "-p",
"-h", remotehost, "-f", lusername, 0);
"-h", hostname, "-f", lusername, (char *)NULL);
} else
execl(_PATH_LOGIN, "login", "-p",
"-h", remotehost, lusername, 0);
"-h", hostname, lusername, (char *)NULL);
fatal(STDERR_FILENO, _PATH_LOGIN, 1);
/*NOTREACHED*/
}
@ -356,7 +327,7 @@ doit(f, fromp)
signal(SIGCHLD, cleanup);
protocol(f, master);
signal(SIGCHLD, SIG_IGN);
cleanup();
cleanup(0);
}
char magic[2] = { 0377, 0377 };
@ -367,6 +338,7 @@ char oobdata[] = {TIOCPKT_WINDOW};
* in the data stream. For now, we are only willing to handle
* window size changes.
*/
int
control(pty, cp, n)
int pty;
char *cp;
@ -389,6 +361,7 @@ control(pty, cp, n)
/*
* rlogin "protocol" machine.
*/
void
protocol(f, p)
register int f, p;
{
@ -549,7 +522,8 @@ protocol(f, p)
}
void
cleanup()
cleanup(signo)
int signo;
{
char *p;
@ -565,9 +539,11 @@ cleanup()
exit(1);
}
void
fatal(f, msg, syserr)
int f, syserr;
int f;
char *msg;
int syserr;
{
int len;
char buf[BUFSIZ], *bp = buf;
@ -587,8 +563,9 @@ fatal(f, msg, syserr)
exit(1);
}
do_rlogin(host)
char *host;
int
do_rlogin(dest)
struct sockaddr_in *dest;
{
getstr(rusername, sizeof(rusername), "remuser too long");
getstr(lusername, sizeof(lusername), "locuser too long");
@ -596,13 +573,14 @@ do_rlogin(host)
pwd = getpwnam(lusername);
if (pwd == NULL)
return(-1);
return (-1);
if (pwd->pw_uid == 0)
return(-1);
return(ruserok(host, 0, rusername, lusername));
return (-1);
/* XXX why don't we syslog() failure? */
return (iruserok(dest->sin_addr.s_addr, 0, rusername, lusername));
}
void
getstr(buf, cnt, errmsg)
char *buf;
int cnt;
@ -621,6 +599,7 @@ getstr(buf, cnt, errmsg)
extern char **environ;
void
setup_term(fd)
int fd;
{
@ -672,8 +651,8 @@ setup_term(fd)
* Return -1 on valid authentication, no authorization
* Return >0 for error conditions
*/
do_krb_login(host, dest)
char *host;
int
do_krb_login(dest)
struct sockaddr_in *dest;
{
int rc;
@ -691,7 +670,7 @@ do_krb_login(host, dest)
if (doencrypt) {
rc = sizeof(faddr);
if (getsockname(0, (struct sockaddr *)&faddr, &rc))
return(-1);
return (-1);
authopts = KOPT_DO_MUTUAL;
rc = krb_recvauth(
authopts, 0,
@ -709,7 +688,7 @@ do_krb_login(host, dest)
kdata, "", (bit_64 *) 0, version);
if (rc != KSUCCESS)
return(rc);
return (rc);
getstr(lusername, sizeof(lusername), "locuser");
/* get the "cmd" in the rcmd protocol */
@ -717,17 +696,18 @@ do_krb_login(host, dest)
pwd = getpwnam(lusername);
if (pwd == NULL)
return(-1);
return (-1);
/* returns nonzero for no access */
if (kuserok(kdata,lusername) != 0)
return(-1);
if (kuserok(kdata, lusername) != 0)
return (-1);
return(0);
return (0);
}
#endif /* KERBEROS */
void
usage()
{
#ifdef KERBEROS
@ -745,19 +725,20 @@ usage()
* assume that the host is local, as it will be
* interpreted as such.
*/
int
local_domain(h)
char *h;
{
char localhost[MAXHOSTNAMELEN];
char *p1, *p2, *topdomain();
char *p1, *p2;
localhost[0] = 0;
(void) gethostname(localhost, sizeof(localhost));
p1 = topdomain(localhost);
p2 = topdomain(h);
if (p1 == NULL || p2 == NULL || !strcasecmp(p1, p2))
return(1);
return(0);
return (1);
return (0);
}
char *