summaryrefslogtreecommitdiff
path: root/libexec/rlogind
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-02-05 21:09:31 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-02-05 21:09:31 +0000
commit3452636809e58e3ef61712c931058058b76124f0 (patch)
tree61d952868fbdd66a7c0088d146013c3377effdac /libexec/rlogind
parentd072cb1d72d081c99e69ffb1da4b5cc1f4a6206e (diff)
do not warn about valid options; invalid options correctly quit
Diffstat (limited to 'libexec/rlogind')
-rw-r--r--libexec/rlogind/rlogind.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index c9789037856..30f366f6507 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: rlogind.c,v 1.15 1997/02/05 14:26:52 deraadt Exp $";
+static char *rcsid = "$Id: rlogind.c,v 1.16 1997/02/05 21:09:30 deraadt Exp $";
#endif /* not lint */
/*
@@ -258,8 +258,7 @@ doit(f, fromp)
}
#ifdef IP_OPTIONS
{
- u_char optbuf[BUFSIZ/3], *cp;
- char lbuf[sizeof(optbuf)*3+1], *lp;
+ u_char optbuf[BUFSIZ/3];
int optsize = sizeof(optbuf), ipproto, i;
struct protoent *ip;
@@ -269,11 +268,6 @@ doit(f, fromp)
ipproto = IPPROTO_IP;
if (getsockopt(0, ipproto, IP_OPTIONS, (char *)optbuf,
&optsize) == 0 && optsize != 0) {
- for (lp = lbuf, i = 0; i < optsize; i++, lp += 3)
- sprintf(lp, " %2.2x", optbuf[i]);
- syslog(LOG_NOTICE,
- "Connection received using IP options (ignored):%s",
- lbuf);
for (i = 0; i < optsize; ) {
u_char c = optbuf[i];
if (c == IPOPT_LSRR || c == IPOPT_SSRR)