summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-20 22:09:59 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-20 22:09:59 +0000
commit37a4268a102ac66bbc8d283b3ae57d952bf26425 (patch)
tree13e31c6f791e396709c76ea3ba29dc6db93c51f3
parentcb881ba629126c535ae38ccc72939ccc41869f70 (diff)
downloadhercules-37a4268a102ac66bbc8d283b3ae57d952bf26425.tar.gz
hercules-37a4268a102ac66bbc8d283b3ae57d952bf26425.tar.bz2
hercules-37a4268a102ac66bbc8d283b3ae57d952bf26425.tar.xz
hercules-37a4268a102ac66bbc8d283b3ae57d952bf26425.zip
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14069 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char/char.c8
-rw-r--r--src/char_sql/char.c8
-rw-r--r--src/login/login.c4
4 files changed, 12 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 726f9727f..a6a764516 100644
--- a/Changelog-Trunk.txt
+++ b/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]
diff --git a/src/char/char.c b/src/char/char.c
index d7eb63a77..ecf8c8b4b 100644
--- a/src/char/char.c
+++ b/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);
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 9d699cbb5..d57168903 100644
--- a/src/char_sql/char.c
+++ b/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);
diff --git a/src/login/login.c b/src/login/login.c
index 964349b0f..e1299f586 100644
--- a/src/login/login.c
+++ b/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);