Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:6671 compiler shows a warning for incompatible arguments for sscanf.

Browse Source 
Removed client hash check for server connection authentication.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16775 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
greenboxal2 2012-09-11 16:15:52 +00:00
parent 9ddcd7010f
commit d974f37145
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/login/login.c
View File

@ -978,7 +978,7 @@ int mmo_auth_new(const char* userid, const char* pass, const char sex, const cha
//----------------------------------------------------- //-----------------------------------------------------
// Check/authentication of a connection // Check/authentication of a connection
//----------------------------------------------------- //-----------------------------------------------------
int mmo_auth(struct login_session_data* sd) int mmo_auth(struct login_session_data* sd, bool isServer)
{ {
struct mmo_account acc; struct mmo_account acc;
int len; int len;
@ -1068,7 +1068,7 @@ int mmo_auth(struct login_session_data* sd)
return acc.state - 1; return acc.state - 1;
} }
if( login_config.client_hash_check ) if( login_config.client_hash_check && !isServer )
{ {
struct client_hash_node *node = login_config.client_hash_nodes; struct client_hash_node *node = login_config.client_hash_nodes;
bool match = false; bool match = false;
@ -1470,7 +1470,7 @@ int parse_login(int fd)
return 0; return 0;
} }
result = mmo_auth(sd); result = mmo_auth(sd, false);
if( result == -1 ) if( result == -1 )
login_auth_ok(sd); login_auth_ok(sd);
@ -1522,7 +1522,7 @@ int parse_login(int fd)
sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port); sprintf(message, "charserver - %s@%u.%u.%u.%u:%u", server_name, CONVIP(server_ip), server_port);
login_log(session[fd]->client_addr, sd->userid, 100, message); login_log(session[fd]->client_addr, sd->userid, 100, message);
result = mmo_auth(sd); result = mmo_auth(sd, true);
if( runflag == LOGINSERVER_ST_RUNNING && if( runflag == LOGINSERVER_ST_RUNNING &&
result == -1 && result == -1 &&
sd->sex == 'S' && sd->sex == 'S' &&
@ -1686,11 +1686,13 @@ int login_config_read(const char* cfgName)
for (i = 0; i < 32; i += 2) { for (i = 0; i < 32; i += 2) {
char buf[3]; char buf[3];
unsigned int byte;
memcpy(buf, &md5[i], 2); memcpy(buf, &md5[i], 2);
buf[2] = 0; buf[2] = 0;
sscanf(buf, "%x", &nnode->hash[i / 2]); sscanf(buf, "%x", &byte);
nnode->hash[i / 2] = (uint8)(byte & 0xFF);
} }
nnode->group_id = group; nnode->group_id = group;