From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 5 Feb 2011 08:31:44 +0000 (+0100)
Subject: Make setrel() refuse to change relations to self
X-Git-Tag: v4.3.27~149
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=985ec19f8b37ab43a2bbd45d592798d470d62ace

Make setrel() refuse to change relations to self

No current caller actually attempts that, but let's make it obvious.
---

diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c
index 9663e7299..05a2a8145 100644
--- a/src/lib/subs/rej.c
+++ b/src/lib/subs/rej.c
@@ -60,6 +60,8 @@ setrel(natid us, natid them, int rel)
 	rel = ALLIED;
     if (CANT_HAPPEN(!mynp || !themnp))
 	return;
+    if (us == them)
+	return;
     oldrel = getrel(mynp, them);
     if (oldrel == rel)
 	return;