Merge 4b50aca214 into 0d2a7a0385
This commit is contained in:
commit
946cc7cb7b
|
|
@ -459,9 +459,10 @@ func StartServer(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
userCreds, err := credentials.Read(c.String(cfdflags.OriginCert), log)
|
|
||||||
var isFEDEndpoint bool
|
var isFEDEndpoint bool
|
||||||
if err != nil {
|
if c.String(TunnelTokenFlag) != "" || c.String(TunnelTokenFileFlag) != "" {
|
||||||
|
isFEDEndpoint = false
|
||||||
|
} else if userCreds, err := credentials.Read(c.String(cfdflags.OriginCert), log); err != nil {
|
||||||
isFEDEndpoint = false
|
isFEDEndpoint = false
|
||||||
} else {
|
} else {
|
||||||
isFEDEndpoint = userCreds.IsFEDEndpoint()
|
isFEDEndpoint = userCreds.IsFEDEndpoint()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue