Whoops, if UUID is empty that is fine

This commit is contained in:
Dane Everitt 2019-11-24 20:01:38 -08:00
parent c96f22787a
commit 3ca6d5d74b
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53

View File

@ -23,7 +23,7 @@ func (s *Server) UpdateDataStructure(data []byte) error {
// Don't allow obviously corrupted data to pass through into this function. If the UUID // Don't allow obviously corrupted data to pass through into this function. If the UUID
// doesn't match something has gone wrong and the API is attempting to meld this server // doesn't match something has gone wrong and the API is attempting to meld this server
// instance into a totally different one, which would be bad. // instance into a totally different one, which would be bad.
if src.Uuid != s.Uuid { if src.Uuid != "" && src.Uuid != s.Uuid {
return errors.New("attempting to merge a data stack with an invalid UUID") return errors.New("attempting to merge a data stack with an invalid UUID")
} }