mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-12 20:19:02 -04:00
Merge from trunk
git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8170 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
parent
438bec9314
commit
ca29082480
@ -277,27 +277,39 @@ class ModuleIdent : public Module
|
||||
if (user->GetExt("ident_socket", isock))
|
||||
{
|
||||
int *fd;
|
||||
if (user->GetExt("ident_socket_fd", fd) && (ServerInstance->SE->GetRef(*fd) == isock))
|
||||
if (user->GetExt("ident_socket_fd", fd))
|
||||
{
|
||||
user->Shrink("ident_socket_fd");
|
||||
delete fd;
|
||||
isock->Close();
|
||||
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");
|
||||
delete fd;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
virtual void OnUserDisconnect(userrec *user)
|
||||
{
|
||||
IdentRequestSocket *isock;
|
||||
if (user->GetExt("ident_socket", isock))
|
||||
{
|
||||
int *fd;
|
||||
if (user->GetExt("ident_socket_fd", fd) && (ServerInstance->SE->GetRef(*fd) == isock))
|
||||
if (user->GetExt("ident_socket_fd", fd))
|
||||
{
|
||||
user->Shrink("ident_socket_fd");
|
||||
delete fd;
|
||||
isock->Close();
|
||||
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");
|
||||
delete fd;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user