projects
/
ircu2.10.12-pk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve the clean-up of outdated IAuth instances on rehash (SF bug #2789656).
[ircu2.10.12-pk.git]
/
ircd
/
m_who.c
diff --git
a/ircd/m_who.c
b/ircd/m_who.c
index 35b40939d8ecca9763f32ac91dceabe2723d3ad1..f344e6f2e88587250d73f1e348a1e772c0dfbfb0 100644
(file)
--- a/
ircd/m_who.c
+++ b/
ircd/m_who.c
@@
-101,8
+101,8
@@
/*
/*
- * A little spin-marking utility to tell us wich clients we have already
- * processed and wich not
+ * A little spin-marking utility to tell us w
h
ich clients we have already
+ * processed and w
h
ich not
*/
static int who_marker = 0;
static void move_marker(void)
*/
static int who_marker = 0;
static void move_marker(void)
@@
-143,7
+143,7
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
struct Client *acptr; /* Client to show */
int bitsel; /* Mask of selectors to apply */
struct Client *acptr; /* Client to show */
int bitsel; /* Mask of selectors to apply */
- int matchsel; /* Wich fields the match should apply on */
+ int matchsel; /* W
h
ich fields the match should apply on */
int counter; /* Query size counter,
initially used to count fields */
int commas; /* Does our mask contain any comma ?
int counter; /* Query size counter,
initially used to count fields */
int commas; /* Does our mask contain any comma ?
@@
-174,6
+174,10
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
while (((ch = *(p++))) && (ch != '%') && (ch != ','))
switch (ch)
{
while (((ch = *(p++))) && (ch != '%') && (ch != ','))
switch (ch)
{
+ case 'd':
+ case 'D':
+ bitsel |= WHOSELECT_DELAY;
+ continue;
case 'o':
case 'O':
bitsel |= WHOSELECT_OPER;
case 'o':
case 'O':
bitsel |= WHOSELECT_OPER;
@@
-267,6
+271,10
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
case 'A':
fields |= WHO_FIELD_ACC;
break;
case 'A':
fields |= WHO_FIELD_ACC;
break;
+ case 'o':
+ case 'O':
+ fields |= WHO_FIELD_OPL;
+ break;
default:
break;
}
default:
break;
}
@@
-322,7
+330,10
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
acptr = member->user;
if ((bitsel & WHOSELECT_OPER) && !SeeOper(sptr,acptr))
continue;
acptr = member->user;
if ((bitsel & WHOSELECT_OPER) && !SeeOper(sptr,acptr))
continue;
- if ((acptr != sptr) && (member->status & (CHFL_ZOMBIE | CHFL_DELAYED)))
+ if ((acptr != sptr)
+ && ((member->status & CHFL_ZOMBIE)
+ || ((member->status & CHFL_DELAYED)
+ && !(bitsel & WHOSELECT_DELAY))))
continue;
if (!(isthere || (SEE_USER(sptr, acptr, bitsel))))
continue;
continue;
if (!(isthere || (SEE_USER(sptr, acptr, bitsel))))
continue;
@@
-369,6
+380,8
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
matchsel &= ~WHO_FIELD_UID;
if ((minlen > HOSTLEN) || !(cset & NTL_IRCHN))
matchsel &= ~WHO_FIELD_HOS;
matchsel &= ~WHO_FIELD_UID;
if ((minlen > HOSTLEN) || !(cset & NTL_IRCHN))
matchsel &= ~WHO_FIELD_HOS;
+ if ((minlen > ACCOUNTLEN))
+ matchsel &= ~WHO_FIELD_ACC;
}
/* First of all loop through the clients in common channels */
}
/* First of all loop through the clients in common channels */
@@
-402,7
+415,9
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
|| matchexec(cli_info(acptr), mymask, minlen))
&& ((!(matchsel & WHO_FIELD_NIP))
|| (HasHiddenHost(acptr) && !IsAnOper(sptr))
|| matchexec(cli_info(acptr), mymask, minlen))
&& ((!(matchsel & WHO_FIELD_NIP))
|| (HasHiddenHost(acptr) && !IsAnOper(sptr))
- || !ipmask_check(&cli_ip(acptr), &imask, ibits)))
+ || !ipmask_check(&cli_ip(acptr), &imask, ibits))
+ && ((!(matchsel & WHO_FIELD_ACC))
+ || matchexec(cli_user(acptr)->account, mymask, minlen)))
continue;
if (!SHOW_MORE(sptr, counter))
break;
continue;
if (!SHOW_MORE(sptr, counter))
break;
@@
-438,7
+453,9
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
|| matchexec(cli_info(acptr), mymask, minlen))
&& ((!(matchsel & WHO_FIELD_NIP))
|| (HasHiddenHost(acptr) && !IsAnOper(sptr))
|| matchexec(cli_info(acptr), mymask, minlen))
&& ((!(matchsel & WHO_FIELD_NIP))
|| (HasHiddenHost(acptr) && !IsAnOper(sptr))
- || !ipmask_check(&cli_ip(acptr), &imask, ibits)))
+ || !ipmask_check(&cli_ip(acptr), &imask, ibits))
+ && ((!(matchsel & WHO_FIELD_ACC))
+ || matchexec(cli_user(acptr)->account, mymask, minlen)))
continue;
if (!SHOW_MORE(sptr, counter))
break;
continue;
if (!SHOW_MORE(sptr, counter))
break;
@@
-449,11
+466,10
@@
int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
/* Make a clean mask suitable to be sent in the "end of" */
if (mask && (p = strchr(mask, ' ')))
*p = '\0';
/* Make a clean mask suitable to be sent in the "end of" */
if (mask && (p = strchr(mask, ' ')))
*p = '\0';
- send_reply(sptr, RPL_ENDOFWHO, BadPtr(mask) ? "*" : mask);
-
/* Notify the user if we decided that his query was too long */
if (counter < 0)
/* Notify the user if we decided that his query was too long */
if (counter < 0)
- send_reply(sptr, ERR_QUERYTOOLONG, "WHO");
+ send_reply(sptr, ERR_QUERYTOOLONG, BadPtr(mask) ? "*" : mask);
+ send_reply(sptr, RPL_ENDOFWHO, BadPtr(mask) ? "*" : mask);
return 0;
}
return 0;
}