From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 13 Feb 2018 14:09:57 +0000 (+0000)
Subject: auth zone review fixes
X-Git-Tag: release-1.7.0rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da06b1c76cfc4c9c04d847df3ec3ee7afd3f0a5b;p=thirdparty%2Funbound.git

auth zone review fixes


git-svn-id: file:///svn/unbound/trunk@4534 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/services/authzone.c b/services/authzone.c
index 955b1f3e0..8cc4307a4 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -82,6 +82,10 @@
 #define AUTH_TRANSFER_TIMEOUT 10000 /* msec */
 /* auth transfer max backoff for failed tranfers and probes */
 #define AUTH_TRANSFER_MAX_BACKOFF 86400 /* sec */
+/* auth http port number */
+#define AUTH_HTTP_PORT 80
+/* auth https port number */
+#define AUTH_HTTPS_PORT 443
 
 /** pick up nextprobe task to start waiting to perform transfer actions */
 static void xfr_set_timeout(struct auth_xfer* xfr, struct module_env* env,
@@ -5913,7 +5917,7 @@ parse_url(char* url, char** host, char** file, int* port, int* ssl)
 	 * or http://127.0.0.1   (index.html)
 	 * or https://[::1@1234]/a/b/c/d */
 	*ssl = 0;
-	*port = 80;
+	*port = AUTH_HTTP_PORT;
 
 	/* parse http:// or https:// */
 	if(strncmp(p, "http://", 7) == 0) {
@@ -5921,7 +5925,7 @@ parse_url(char* url, char** host, char** file, int* port, int* ssl)
 	} else if(strncmp(p, "https://", 8) == 0) {
 		p += 8;
 		*ssl = 1;
-		*port = 443;
+		*port = AUTH_HTTPS_PORT;
 	}
 
 	/* parse hostname part */
diff --git a/util/netevent.c b/util/netevent.c
index 78ee8a0ab..c3f2f7162 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -981,7 +981,7 @@ log_cert(unsigned level, const char* str, X509* cert)
                         |X509_FLAG_NO_ISSUER|X509_FLAG_NO_VALIDITY
 			|X509_FLAG_NO_EXTENSIONS|X509_FLAG_NO_AUX
 			|X509_FLAG_NO_ATTRIBUTES));
-	BIO_write(bio, &nul, sizeof(nul));
+	BIO_write(bio, &nul, (int)sizeof(nul));
 	len = BIO_get_mem_data(bio, &pp);
 	if(len != 0 && pp) {
 		verbose(level, "%s: \n%s", str, pp);