diff options
author | itojun <> | 2000-01-30 05:17:49 +0000 |
---|---|---|
committer | itojun <> | 2000-01-30 05:17:49 +0000 |
commit | 34cad59f396bc527414467532667992dac9644c4 (patch) | |
tree | 34a7fa620f7a0312ebf78b14e7681020044146a3 | |
parent | af545fafa6ab3bf7a4f91cc73e97df4db15930c1 (diff) | |
download | openbsd-34cad59f396bc527414467532667992dac9644c4.tar.gz openbsd-34cad59f396bc527414467532667992dac9644c4.tar.bz2 openbsd-34cad59f396bc527414467532667992dac9644c4.zip |
visit next addrinfo structure when rresvport_af() fails.
this should fix situation like:
- try to rcmd() to dual stack node from IPv4-only node/kernel
-rw-r--r-- | src/lib/libc/net/rcmd.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c index 79892bd5a1..3cd3029a03 100644 --- a/src/lib/libc/net/rcmd.c +++ b/src/lib/libc/net/rcmd.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #if defined(LIBC_SCCS) && !defined(lint) | 36 | #if defined(LIBC_SCCS) && !defined(lint) |
37 | static char *rcsid = "$OpenBSD: rcmd.c,v 1.33 2000/01/27 05:18:47 itojun Exp $"; | 37 | static char *rcsid = "$OpenBSD: rcmd.c,v 1.34 2000/01/30 05:17:49 itojun Exp $"; |
38 | #endif /* LIBC_SCCS and not lint */ | 38 | #endif /* LIBC_SCCS and not lint */ |
39 | 39 | ||
40 | #include <sys/param.h> | 40 | #include <sys/param.h> |
@@ -140,9 +140,14 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) | |||
140 | else | 140 | else |
141 | (void)fprintf(stderr, "rcmd: socket: %s\n", | 141 | (void)fprintf(stderr, "rcmd: socket: %s\n", |
142 | strerror(errno)); | 142 | strerror(errno)); |
143 | sigsetmask(oldmask); | 143 | if (r->ai_next) { |
144 | freeaddrinfo(res); | 144 | r = r->ai_next; |
145 | return (-1); | 145 | continue; |
146 | } else { | ||
147 | sigsetmask(oldmask); | ||
148 | freeaddrinfo(res); | ||
149 | return (-1); | ||
150 | } | ||
146 | } | 151 | } |
147 | fcntl(s, F_SETOWN, pid); | 152 | fcntl(s, F_SETOWN, pid); |
148 | if (connect(s, r->ai_addr, r->ai_addrlen) >= 0) | 153 | if (connect(s, r->ai_addr, r->ai_addrlen) >= 0) |