From 415cb6e4fe39a95c44171726c434a12f90f2b12f Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jesse.c.peterson@gmail.com>
Date: Sat, 18 Mar 2017 22:09:23 -0700
Subject: [PATCH] Base SCEP URL directly off supplied server URL rather than a
 transform

---
 serve.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/serve.go b/serve.go
index 75a1718e..814777fe 100644
--- a/serve.go
+++ b/serve.go
@@ -404,12 +404,7 @@ func (c *config) setupEnrollmentService() {
 		c.err = err
 		return
 	}
-	pub, err := url.Parse(c.ServerPublicURL)
-	if err != nil {
-		c.err = err
-		return
-	}
-	SCEPRemoteURL := "https://" + strings.Split(pub.Host, ":")[0] + "/scep"
+	SCEPRemoteURL := strings.TrimRight(c.ServerPublicURL, "/") + "/scep"
 
 	var tlsCert string
 	var SCEPCertificateSubject string