Selaa lähdekoodia

Disabled ip checking during auth, since it lead to a lot of confusion.
This essentially reverts the default behavior to before r10021.
Re-enabling should only be reconsidered after the subnet mechanism is made fully automatic.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14069 54d463be-8e91-2dee-dedb-b68131a5f0ec

ultramage 15 vuotta sitten
vanhempi
commit
84cc5b7513
4 muutettua tiedostoa jossa 12 lisäystä ja 10 poistoa
  1. 2 0
      Changelog-Trunk.txt
  2. 4 4
      src/char/char.c
  3. 4 4
      src/char_sql/char.c
  4. 2 2
      src/login/login.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+09/09/21
+	* Disabled ip checking during auth, since it lead to a lot of confusion. [ultramage]
 09/09/17
 	* Duration of SC_STONE is not reduced by MDEF. [Inkfish]
 	* LexAeterna is allowed to be used on petrifying targets. [Inkfish]

+ 4 - 4
src/char/char.c

@@ -3099,8 +3099,8 @@ int parse_frommap(int fd)
 				node->account_id == account_id &&
 				node->char_id == char_id &&
 				node->login_id1 == login_id1 &&
-				node->sex == sex &&
-				node->ip == ip )
+				node->sex == sex /*&&
+				node->ip == ip*/ )
 			{// auth ok
 				cd->sex = sex;
 
@@ -3281,8 +3281,8 @@ int parse_char(int fd)
 			if( node != NULL &&
 			    node->account_id == account_id &&
 				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 &&
-				node->ip         == ipl )
+				node->login_id2  == login_id2 /*&&
+				node->ip         == ipl*/ )
 			{// authentication found (coming from map server)
 				idb_remove(auth_db, account_id);
 				char_auth_ok(fd, sd);

+ 4 - 4
src/char_sql/char.c

@@ -2763,8 +2763,8 @@ int parse_frommap(int fd)
 				node->account_id == account_id &&
 				node->char_id == char_id &&
 				node->login_id1 == login_id1 &&
-				node->sex == sex &&
-				node->ip == ip )
+				node->sex == sex /*&&
+				node->ip == ip*/ )
 			{// auth ok
 				cd->sex = sex;
 
@@ -2943,8 +2943,8 @@ int parse_char(int fd)
 			if( node != NULL &&
 			    node->account_id == account_id &&
 				node->login_id1  == login_id1 &&
-				node->login_id2  == login_id2 &&
-				node->ip         == ipl )
+				node->login_id2  == login_id2 /*&&
+				node->ip         == ipl*/ )
 			{// authentication found (coming from map server)
 				idb_remove(auth_db, account_id);
 				char_auth_ok(fd, sd);

+ 2 - 2
src/login/login.c

@@ -411,8 +411,8 @@ int parse_fromchar(int fd)
 			    node->account_id == account_id &&
 				node->login_id1  == login_id1 &&
 				node->login_id2  == login_id2 &&
-				node->sex        == sex_num2str(sex) &&
-				node->ip         == ip_ )
+				node->sex        == sex_num2str(sex) /*&&
+				node->ip         == ip_*/ )
 			{// found
 				//ShowStatus("Char-server '%s': authentication of the account %d accepted (ip: %s).\n", server[id].name, account_id, ip);