Merge branch 'rickard/dist-exit2/21/OTP-15867' into maint-21

* rickard/dist-exit2/21/OTP-15867:
  Don't disconnect on remote exit/2 with old incarnation as recipient

1 files changed, 9 insertions, 1 deletions

diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 0633bff3c2..bbe2fc31f3 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1713,9 +1713,17 @@ int erts_net_message(Port *prt,
 	    token = tuple[4];
 	    reason = tuple[5];
 	}
-	if (is_not_pid(from) || is_not_internal_pid(to)) {
+	if (is_not_pid(from)) {
 	    goto invalid_message;
 	}
+        if (is_not_internal_pid(to)) {
+            if (is_external_pid(to)) {
+		DistEntry *dep = external_pid_dist_entry(to);
+		if (dep == erts_this_dist_entry)
+                    break; /* Old incarnation of this node... */
+            }
+            goto invalid_message;
+        }
 
         erts_proc_sig_send_exit(NULL, from, to, reason, token, 0);
 	break;