Revert "Accept an address change in RECOVERY in more cases."

This reverts commit afb8400.

Author: neunhoef

service/service.go

@@ -900,30 +900,15 @@ func (s *Service) HandleHello(ownAddress, remoteAddress string, req *HelloReques
 			// ID already found, update peer data
 			for i, p := range s.myPeers.AllPeers {
 				if p.ID == req.SlaveID {
+					s.myPeers.AllPeers[i].Port = req.SlavePort
 					if s.cfg.AllPortOffsetsUnique {
 						s.myPeers.AllPeers[i].Address = slaveAddr
 					} else {
-						// Need to check if this particular address does appear in
-						// another peer, if so, we forbid to change the address:
-						addrFound := false
-						for j, pp := range s.myPeers.AllPeers {
-							if j != i && pp.Address == slaveAddr {
-								addrFound = true
-								break
-							}
-						}
-						// Slave address may not change in this case
-						if addrFound && p.Address != slaveAddr {
+						// Slave address may not change
+						if p.Address != slaveAddr {
 							return ClusterConfig{}, maskAny(client.NewBadRequestError("Cannot change slave address while using an existing ID."))
 						}
-						// We accept the new address (it might be the old one):
-						s.myPeers.AllPeers[i].Address = slaveAddr
-						// However, since we also accept the port, we must set the
-						// port ofset of that replaced peer to 0 such that the AllPeers
-						// information actually contains the right port.
-						s.myPeers.AllPeers[i].PortOffset = 0
 					}
-					s.myPeers.AllPeers[i].Port = req.SlavePort
 					s.myPeers.AllPeers[i].DataDir = req.DataDir
 				}
 			}