summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorotto <>2006-02-01 21:33:14 +0000
committerotto <>2006-02-01 21:33:14 +0000
commitc5ab6afac874388050ff617dc754f0917bab54ec (patch)
tree60a1fb43bba368f7e74448eec1c9207732a9511d /src
parentef09ea7f9f936fccb15b3629daa69854871c4870 (diff)
downloadopenbsd-c5ab6afac874388050ff617dc754f0917bab54ec.tar.gz
openbsd-c5ab6afac874388050ff617dc754f0917bab54ec.tar.bz2
openbsd-c5ab6afac874388050ff617dc754f0917bab54ec.zip
remove obsolete code; from Ray Lai in PR 4998; ok tedu@ beck@
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/nc/netcat.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c
index cec87ff731..bea1b79ba5 100644
--- a/src/usr.bin/nc/netcat.c
+++ b/src/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: netcat.c,v 1.86 2006/01/25 23:21:37 djm Exp $ */ 1/* $OpenBSD: netcat.c,v 1.87 2006/02/01 21:33:14 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> 3 * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
4 * 4 *
@@ -491,13 +491,6 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
491 if (sflag || pflag) { 491 if (sflag || pflag) {
492 struct addrinfo ahints, *ares; 492 struct addrinfo ahints, *ares;
493 493
494 if (!(sflag && pflag)) {
495 if (!sflag)
496 sflag = NULL;
497 else
498 pflag = NULL;
499 }
500
501 memset(&ahints, 0, sizeof(struct addrinfo)); 494 memset(&ahints, 0, sizeof(struct addrinfo));
502 ahints.ai_family = res0->ai_family; 495 ahints.ai_family = res0->ai_family;
503 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; 496 ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;