ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-04-06 00:00:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8170 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-10-13 22:59:05 +00:00
parent 438bec9314
commit ca29082480
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/m_ident.cpp
View File

@ -277,11 +277,17 @@ class ModuleIdent : public Module
if (user->GetExt("ident_socket", isock)) if (user->GetExt("ident_socket", isock))
{ {
int *fd; int *fd;
if (user->GetExt("ident_socket_fd", fd) && (ServerInstance->SE->GetRef(*fd) == isock)) if (user->GetExt("ident_socket_fd", fd))
{
if (ServerInstance->SE->GetRef(*fd) == isock)
isock->Close();
/* Check again, isock->Close() can confuse us */
if (user->GetExt("ident_socket_fd", fd))
{ {
user->Shrink("ident_socket_fd"); user->Shrink("ident_socket_fd");
delete fd; delete fd;
isock->Close(); }
} }
} }
} }
@ -293,11 +299,17 @@ class ModuleIdent : public Module
if (user->GetExt("ident_socket", isock)) if (user->GetExt("ident_socket", isock))
{ {
int *fd; int *fd;
if (user->GetExt("ident_socket_fd", fd) && (ServerInstance->SE->GetRef(*fd) == isock)) if (user->GetExt("ident_socket_fd", fd))
{
if (ServerInstance->SE->GetRef(*fd) == isock)
isock->Close();
/* Check again, isock->Close() can confuse us */
if (user->GetExt("ident_socket_fd", fd))
{ {
user->Shrink("ident_socket_fd"); user->Shrink("ident_socket_fd");
delete fd; delete fd;
isock->Close(); }
} }
} }
} }