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
Treat G-line-related times as network times, rather than local times.
[ircu2.10.12-pk.git]
/
ircd
/
m_who.c
diff --git
a/ircd/m_who.c
b/ircd/m_who.c
index 6b277f1bcd41d5c2e06cfd82a5154dc84c88b238..f344e6f2e88587250d73f1e348a1e772c0dfbfb0 100644
(file)
--- a/
ircd/m_who.c
+++ b/
ircd/m_who.c
@@
-271,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;
}
@@
-376,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 */
@@
-409,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;
@@
-445,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;
@@
-456,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;
}