summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-02-05 14:26:53 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-02-05 14:26:53 +0000
commitcea9f565efb87bc31dfe933406221217f7da4d32 (patch)
tree8a2c94e32b6c2118e0918c485b8135fdf0cc64c5
parent0fb2744d59c92e13d124a7d3907a0250e4521bf9 (diff)
need not clear options since bad ones cause exit; provos@ws1.physnet.uni-hamburg.de
-rw-r--r--libexec/rlogind/rlogind.c8
-rw-r--r--libexec/rshd/rshd.c7
2 files changed, 2 insertions, 13 deletions
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index a429e538566..c9789037856 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.14 1997/02/05 04:18:27 deraadt Exp $";
+static char *rcsid = "$Id: rlogind.c,v 1.15 1997/02/05 14:26:52 deraadt Exp $";
#endif /* not lint */
/*
@@ -282,12 +282,6 @@ doit(f, fromp)
break;
i += (c == IPOPT_NOP) ? 1 : optbuf[i+1];
}
- if (setsockopt(0, ipproto, IP_OPTIONS,
- (char *)NULL, optsize) != 0) {
- syslog(LOG_ERR,
- "setsockopt IP_OPTIONS NULL: %m");
- exit(1);
- }
}
}
#endif
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 0e02071c23d..2c6715c9344 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */
-static char *rcsid = "$Id: rshd.c,v 1.11 1997/02/05 04:18:30 deraadt Exp $";
+static char *rcsid = "$Id: rshd.c,v 1.12 1997/02/05 14:26:49 deraadt Exp $";
#endif /* not lint */
/*
@@ -262,11 +262,6 @@ doit(fromp)
break;
i += (c == IPOPT_NOP) ? 1 : optbuf[i+1];
}
- if (setsockopt(0, ipproto, IP_OPTIONS,
- (char *)NULL, optsize) != 0) {
- syslog(LOG_ERR, "setsockopt IP_OPTIONS NULL: %m");
- exit(1);
- }
}
}
#endif