aboutsummaryrefslogtreecommitdiffstats
path: root/src/users.cpp
diff options
context:
space:
mode:
authorGravatar brain2006-09-19 18:24:07 +0000
committerGravatar brain2006-09-19 18:24:07 +0000
commit8ed63fe681c5dbd1f3993b8b8e3ef7a7e9ef0fc8 (patch)
tree9e32a7ac804850b4f2035bc9ac55a262a7992db7 /src/users.cpp
parentFix crashes, and in the process make xline even faster! (diff)
downloadinspircd++-8ed63fe681c5dbd1f3993b8b8e3ef7a7e9ef0fc8.tar.gz
inspircd++-8ed63fe681c5dbd1f3993b8b8e3ef7a7e9ef0fc8.tar.bz2
inspircd++-8ed63fe681c5dbd1f3993b8b8e3ef7a7e9ef0fc8.zip
Make the check against z/k/q/e/g methods return a pointer to the whole object rather than just the reason string
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5305 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/users.cpp')
-rw-r--r--src/users.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/users.cpp b/src/users.cpp
index 8c6711d64..46d841de5 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -973,14 +973,14 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
userrec::QuitUser(Instance, _new,"Server is full");
return;
}
- char* e = Instance->XLines->matches_exception(_new);
+ ELine* e = Instance->XLines->matches_exception(_new);
if (!e)
{
- char* r = Instance->XLines->matches_zline(ipaddr);
+ ZLine* r = Instance->XLines->matches_zline(ipaddr);
if (r)
{
char reason[MAXBUF];
- snprintf(reason,MAXBUF,"Z-Lined: %s",r);
+ snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
userrec::QuitUser(Instance, _new,reason);
return;
}
@@ -1068,26 +1068,26 @@ void userrec::FullConnect(CullList* Goners)
return;
}
- char* e = ServerInstance->XLines->matches_exception(this);
+ ELine* e = ServerInstance->XLines->matches_exception(this);
if (!e)
{
- char* r = ServerInstance->XLines->matches_gline(this);
+ GLine* r = ServerInstance->XLines->matches_gline(this);
if (r)
{
char reason[MAXBUF];
- snprintf(reason,MAXBUF,"G-Lined: %s",r);
+ snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
Goners->AddItem(this, reason);
return;
}
- r = ServerInstance->XLines->matches_kline(this);
+ KLine* n = ServerInstance->XLines->matches_kline(this);
- if (r)
+ if (n)
{
char reason[MAXBUF];
- snprintf(reason,MAXBUF,"K-Lined: %s",r);
+ snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
Goners->AddItem(this, reason);
return;
}