Merge branch 'hs2021-v2' of https://github.com/juanfont/headscale into hs2021-v2
This commit is contained in:
commit
6aec520889
|
@ -600,8 +600,8 @@ func (machine Machine) toNode(
|
||||||
}
|
}
|
||||||
|
|
||||||
var machineKey key.MachinePublic
|
var machineKey key.MachinePublic
|
||||||
if machine.MachineKey != "" {
|
|
||||||
// MachineKey is only used in the legacy protocol
|
// MachineKey is only used in the legacy protocol
|
||||||
|
if machine.MachineKey != "" {
|
||||||
err = machineKey.UnmarshalText(
|
err = machineKey.UnmarshalText(
|
||||||
[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
|
[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue