diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2020-01-09 04:16:56 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2020-01-09 04:16:56 +0100 |
| commit | 5584806ca17a86bc390c183e6d71dcb839748be6 (patch) | |
| tree | 466a04a321fcc6428ceb929a78d689dbe32bbe10 | |
| parent | test timingsafe_memcmp (diff) | |
| parent | fix asr warnings (diff) | |
| download | OpenSMTPD-5584806ca17a86bc390c183e6d71dcb839748be6.tar.xz OpenSMTPD-5584806ca17a86bc390c183e6d71dcb839748be6.zip | |
Merge branch 'portable' into portable-libtls
| -rw-r--r-- | openbsd-compat/libasr/asr_debug.c | 2 | ||||
| -rw-r--r-- | openbsd-compat/libasr/getaddrinfo_async.c | 2 | ||||
| -rw-r--r-- | openbsd-compat/libasr/getnameinfo_async.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/openbsd-compat/libasr/asr_debug.c b/openbsd-compat/libasr/asr_debug.c index 4ae51fe4..be80436a 100644 --- a/openbsd-compat/libasr/asr_debug.c +++ b/openbsd-compat/libasr/asr_debug.c @@ -78,7 +78,7 @@ print_rr(const struct asr_dns_rr *rr, char *buf, size_t max) rr->rr_ttl, __p_class(rr->rr_class), __p_type(rr->rr_type)); - if (r < 0 || r >= max) { + if (r < 0 || (size_t)r >= max) { buf[0] = '\0'; return (buf); } diff --git a/openbsd-compat/libasr/getaddrinfo_async.c b/openbsd-compat/libasr/getaddrinfo_async.c index 4a569816..1fd44ff7 100644 --- a/openbsd-compat/libasr/getaddrinfo_async.c +++ b/openbsd-compat/libasr/getaddrinfo_async.c @@ -476,7 +476,9 @@ getaddrinfo_async_run(struct asr_query *as, struct asr_result *ar) static int get_port(const char *servname, const char *proto, int numonly) { +#ifdef HAVE_GETSERVBYNAME_R_4_ARGS struct servent se; +#endif #ifdef HAVE_STRUCT_SERVENT_DATA struct servent_data sed; #endif diff --git a/openbsd-compat/libasr/getnameinfo_async.c b/openbsd-compat/libasr/getnameinfo_async.c index b0a34bfa..faba8860 100644 --- a/openbsd-compat/libasr/getnameinfo_async.c +++ b/openbsd-compat/libasr/getnameinfo_async.c @@ -250,7 +250,7 @@ _servname(struct asr_query *as) } r = snprintf(buf, buflen, "%u", ntohs(port)); - if (r < 0 || r >= buflen) + if (r < 0 || (size_t)r >= buflen) return (-1); return (0); |