From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 15 Apr 2016 09:10:50 +0000 (+0200)
Subject: Don't assume sa.sa_family is a short int.
X-Git-Tag: release-1.1pre12~29
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=d4410d0cce40929db9a0ce7042ef962f1867234d

Don't assume sa.sa_family is a short int.

Because FreeBSD's compiler complained about it.
---

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 2262fbb2..0a7ad1ca 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -117,7 +117,7 @@ static bool send_proxyrequest(connection_t *c) {
 				i += 2;
 				c->tcplen += 22;
 			} else {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
+				logger(DEBUG_ALWAYS, LOG_ERR, "Address family %x not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
 				return false;
 			}
 			if(i > len)