Merge branch 'hs2021-v2' of https://github.com/juanfont/headscale into hs2021-v2

This commit is contained in:
Juan Font Alonso 2022-08-20 00:06:58 +02:00
commit 6aec520889

View File

@ -600,8 +600,8 @@ func (machine Machine) toNode(
}
var machineKey key.MachinePublic
if machine.MachineKey != "" {
// MachineKey is only used in the legacy protocol
if machine.MachineKey != "" {
err = machineKey.UnmarshalText(
[]byte(MachinePublicKeyEnsurePrefix(machine.MachineKey)),
)