From e869d65fb76558cb3d09faf9c64d22db3dc9a472 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Mon, 23 Oct 2017 17:41:44 -0400
Subject: [PATCH] Make compile

---
 command/server.go      | 12 ------------
 http/handler.go        |  1 +
 http/sys_rekey_test.go |  4 ++--
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/command/server.go b/command/server.go
index 5aa475a18e..59c1c5770d 100644
--- a/command/server.go
+++ b/command/server.go
@@ -677,18 +677,6 @@ CLUSTER_SYNTHESIS_COMPLETE:
 		go server.Serve(ln)
 	}
 
-	if sealConfigError != nil {
-		init, err := core.Initialized()
-		if err != nil {
-			c.Ui.Error(fmt.Sprintf("Error checking if core is initialized: %v", err))
-			return 1
-		}
-		if init {
-			c.Ui.Error("Vault is initialized but no Seal key could be loaded")
-			return 1
-		}
-	}
-
 	if newCoreError != nil {
 		c.Ui.Output("==> Warning:\n\nNon-fatal error during initialization; check the logs for more information.")
 		c.Ui.Output("")
diff --git a/http/handler.go b/http/handler.go
index c3339c7c04..4561e15aa3 100644
--- a/http/handler.go
+++ b/http/handler.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/vault/helper/consts"
diff --git a/http/sys_rekey_test.go b/http/sys_rekey_test.go
index 13e95f8cbb..0a901d1b28 100644
--- a/http/sys_rekey_test.go
+++ b/http/sys_rekey_test.go
@@ -62,7 +62,7 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 	defer ln.Close()
 	TestServerAuth(t, addr, token)
 
-		// Start rekey
+	// Start rekey
 	resp := testHttpPut(t, token, addr+"/v1/sys/rekey/init", map[string]interface{}{
 		"secret_shares":    5,
 		"secret_threshold": 3,
@@ -89,7 +89,7 @@ func TestSysRekey_Init_Setup(t *testing.T) {
 		t.Fatalf("\nexpected: %#v\nactual: %#v", expected, actual)
 	}
 
-		// Get rekey status
+	// Get rekey status
 	resp = testHttpGet(t, token, addr+"/v1/sys/rekey/init")
 
 	actual = map[string]interface{}{}