From 30ab5c2a882ed02092d36f10728af7a2212f1063 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Mon, 23 Jan 2017 03:58:47 -0800
Subject: [PATCH] http/pool: more options fixes.

---
 etc/sample.conf    | 6 +++---
 lib/http/server.js | 2 +-
 lib/net/pool.js    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/sample.conf b/etc/sample.conf
index 7932bb9e..f2cc49cb 100644
--- a/etc/sample.conf
+++ b/etc/sample.conf
@@ -34,7 +34,7 @@ log-file: true
 
 witness: true
 prune: false
-use-checkpoints: true
+checkpoints: true
 coin-cache: 40
 index-tx: false
 index-address: false
@@ -71,7 +71,7 @@ host: ::
 # port: 8333
 
 # Public Host & Port (to advertise to peers)
-# public-host: 0.0.0.0
+# public-host: 1.2.3.4
 # public-port: 8444
 
 # BIP151 AuthDB and Identity Key
@@ -101,4 +101,4 @@ http-host: ::
 service-key: bikeshed
 api-key: bikeshed
 wallet-auth: false
-no-auth: false
+# no-auth: false
diff --git a/lib/http/server.js b/lib/http/server.js
index c9a74e6a..b0757d61 100644
--- a/lib/http/server.js
+++ b/lib/http/server.js
@@ -1785,7 +1785,7 @@ HTTPOptions.prototype.fromOptions = function fromOptions(options) {
 
   // Allow no-auth implicitly
   // if we're listening locally.
-  if (!options.apiKey && !options.serviceKey) {
+  if (!options.apiKey && !options.serviceKey && options.noAuth == null) {
     if (IP.isLoopback(this.host))
       this.noAuth = true;
   }
diff --git a/lib/net/pool.js b/lib/net/pool.js
index 079312fa..ed05cc67 100644
--- a/lib/net/pool.js
+++ b/lib/net/pool.js
@@ -3162,6 +3162,7 @@ function PoolOptions(options) {
 
   this.nonces = new NonceList();
   this.address = new NetAddress();
+  this.address.port = this.network.port;
 
   this.witness = true;
   this.checkpoints = false;