empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Permit no-op country name change again

Browse source 
Commit aa5861d1 (v4.3.20) made add, edit and change reject a country
name that is already in use.  Even if it's used by the same country.
Relax that.
This commit is contained in:
Markus Armbruster 2011-10-30 15:43:56 +01:00
parent 9b2e906ea1
commit 062c660e28
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/edit.c
View file

@ -31,7 +31,7 @@
* Chad Zabel, 1994
* Steve McClure, 1998-2000
* Ron Koenderink, 2003-2009
* Markus Armbruster, 2003-2010
* Markus Armbruster, 2003-2011
*/
#include <config.h>
@ -657,7 +657,7 @@ docountry(char op, int arg, char *p, struct natstr *np)
switch (op) {
case 'n':
if (!check_nat_name(p))
if (!check_nat_name(p, nat))
return RET_SYN;
pr("Country name changed from %s to %s\n", np->nat_cnam, p);
strcpy(np->nat_cnam, p);