Indentation and style fixes.

This commit is contained in:
Brett Smith 2012-08-23 14:18:15 -04:00
parent 164954a788
commit be97fa8ab1
2 changed files with 14 additions and 13 deletions

View File

@ -921,22 +921,22 @@ va_dcl
GLOBAL char*
Conn_Password( CONN_ID Idx )
{
assert( Idx > NONE );
if (My_Connections[Idx].pwd == NULL)
return (char*)"\0";
else
return My_Connections[Idx].pwd;
assert( Idx > NONE );
if (My_Connections[Idx].pwd == NULL)
return (char*)"\0";
else
return My_Connections[Idx].pwd;
} /* Conn_Password */
GLOBAL void
Conn_SetPassword( CONN_ID Idx, const char *Pwd )
{
assert( Idx > NONE );
My_Connections[Idx].pwd = strdup(Pwd);
if (My_Connections[Idx].pwd == NULL) {
Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
exit(1);
}
assert( Idx > NONE );
My_Connections[Idx].pwd = strdup(Pwd);
if (My_Connections[Idx].pwd == NULL) {
Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
exit(1);
}
} /* Conn_SetPassword */
/**
@ -1167,7 +1167,7 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie
array_free(&My_Connections[Idx].rbuf);
array_free(&My_Connections[Idx].wbuf);
if (My_Connections[Idx].pwd != NULL)
free(My_Connections[Idx].pwd);
free(My_Connections[Idx].pwd);
/* Clean up connection structure (=free it) */
Init_Conn_Struct( Idx );

View File

@ -80,7 +80,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true);
return DISCONNECTED;
}
if( strcmp( Conn_Password( Client_Conn( Client ) ), Conf_Server[i].pwd_in ) != 0 )
if( strcmp( Conn_Password( Client_Conn( Client ) ),
Conf_Server[i].pwd_in ) != 0 )
{
/* wrong password */
Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] );