[tor-commits] [snowflake/master] Make certManager a pointer and only set it when !disableTLS.

[dcf]

commit b0826304a4a18e4e30136ba7532b82372ef63c56
Author: David Fifield <da...@bamsoftware.com>
Date:   Sat Jan 21 13:52:24 2017 -0800

    Make certManager a pointer and only set it when !disableTLS.
---
 server/server.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/server.go b/server/server.go
index aaf2e05..62f166d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -250,13 +250,14 @@ func main() {
                log.Fatalf("error in setup: %s", err)
        }
 
+       var certManager *autocert.Manager
        if !disableTLS {
                log.Printf("ACME hostnames: %q", acmeHostnames)
-       }
-       certManager := autocert.Manager{
-               Prompt:     autocert.AcceptTOS,
-               HostPolicy: autocert.HostWhitelist(acmeHostnames...),
-               Email:      acmeEmail,
+               certManager = &autocert.Manager{
+                       Prompt:     autocert.AcceptTOS,
+                       HostPolicy: autocert.HostWhitelist(acmeHostnames...),
+                       Email:      acmeEmail,
+               }
        }
 
        // The ACME responder only works when it is running on port 443. In case
@@ -284,7 +285,7 @@ func main() {
                        addr := *bindaddr.Addr
                        addr.Port = 443
                        log.Printf("opening additional ACME listener on %s", 
addr.String())
-                       ln443, err := startListenerTLS("tcp", &addr, 
&certManager)
+                       ln443, err := startListenerTLS("tcp", &addr, 
certManager)
                        if err != nil {
                                log.Printf("error opening ACME listener: %s", 
err)
                                pt.SmethodError(bindaddr.MethodName, "ACME 
listener: "+err.Error())
@@ -304,7 +305,7 @@ func main() {
                        for _, hostname := range acmeHostnames {
                                args.Add("hostname", hostname)
                        }
-                       ln, err = startListenerTLS("tcp", bindaddr.Addr, 
&certManager)
+                       ln, err = startListenerTLS("tcp", bindaddr.Addr, 
certManager)
                }
                if err != nil {
                        log.Printf("error opening listener: %s", err)



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits