[tor-commits] [meek/master] Allow --port to set port 443 with --acme-hostnames.

[dcf at torproject.org]

commit 83daf8ad841b7dfc3867bcd750139876afc6b369
Author: David Fifield <david at bamsoftware.com>
Date:   Tue Sep 26 17:27:35 2017 -0700

    Allow --port to set port 443 with --acme-hostnames.
    
    --port is meant to override TOR_PT_SERVER_BINDADDR, but it was not
    overriding in the check for the presence of a bindaddr on port 443.
    
    SMETHOD-ERROR meek The --acme-hostnames option requires one of the bindaddrs to be on port 443.
---
 meek-server/meek-server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go
index b599280..eceba0c 100644
--- a/meek-server/meek-server.go
+++ b/meek-server/meek-server.go
@@ -428,7 +428,7 @@ func main() {
 		// The ACME responder only works when it is running on port 443.
 		// https://letsencrypt.github.io/acme-spec/#domain-validation-with-server-name-indication-dvsni
 		for _, bindaddr := range ptInfo.Bindaddrs {
-			if bindaddr.Addr.Port == 443 {
+			if port == 443 || bindaddr.Addr.Port == 443 {
 				missing443Listener = false
 				break
 			}