diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-13 15:56:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-13 15:56:01 -0500 |
| commit | dca8ae5cfa8b081230d033158c980d50840b072a (patch) | |
| tree | abe2a89df68efc1c78c9f89f795d100d02adcd2b | |
| parent | b421b3f621986318e28d4cc44c28aae7fa909b86 (diff) | |
| parent | e129393e40ae291b825d41946580d8a4cf63a61d (diff) | |
| download | tor-dca8ae5cfa8b081230d033158c980d50840b072a.tar.gz tor-dca8ae5cfa8b081230d033158c980d50840b072a.zip | |
Merge remote-tracking branch 'dgoulet/bug21116_030_01'
| -rw-r--r-- | changes/bug21116 | 3 | ||||
| -rw-r--r-- | src/test/test_util.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug21116 b/changes/bug21116 new file mode 100644 index 0000000000..2304ab0fd6 --- /dev/null +++ b/changes/bug21116 @@ -0,0 +1,3 @@ + o Minor bugfixes (test): + - Fix Raspbian build missing socket errno in test util. Fixes bug 21116.; + bugfix on tor-0.2.8.2. Patch by "hein". diff --git a/src/test/test_util.c b/src/test/test_util.c index fafb84f4fe..c317e724cc 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5091,7 +5091,8 @@ test_util_socket(void *arg) fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0); int err = tor_socket_errno(fd1); - if (fd1 < 0 && err == SOCK_ERRNO(EPROTONOSUPPORT)) { + if (fd1 < 0 && (err == SOCK_ERRNO(EPROTONOSUPPORT) || + err == SOCK_ERRNO(EAFNOSUPPORT))) { /* Assume we're on an IPv4-only or IPv6-only system, and give up now. */ goto done; } |