[svn] Change two occurances like match(userinput, target_p->name) ||
match(target_p->name, userinput) to just match(userinput, target_p->name). No client name can contain * or ? now.
This commit is contained in:
parent
e26e2b1954
commit
4d7a1ee5d1
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
jilles 2007/02/01 00:49:07 UTC (20070201-3181)
|
||||||
|
Log:
|
||||||
|
Do not try find_server() on a name find_client() has
|
||||||
|
returned NULL for, as this will always return NULL
|
||||||
|
since the removal of hostmasking.
|
||||||
|
|
||||||
|
|
||||||
|
Changes: Modified:
|
||||||
|
+1 -2 trunk/modules/m_pong.c (File Modified)
|
||||||
|
+0 -4 trunk/src/s_serv.c (File Modified)
|
||||||
|
|
||||||
|
|
||||||
jilles 2007/02/01 00:34:33 UTC (20070201-3179)
|
jilles 2007/02/01 00:34:33 UTC (20070201-3179)
|
||||||
Log:
|
Log:
|
||||||
Remove server_exists() which checked whether the
|
Remove server_exists() which checked whether the
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define SERNO "20070201-3179"
|
#define SERNO "20070201-3181"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||||
* USA
|
* USA
|
||||||
*
|
*
|
||||||
* $Id: m_trace.c 609 2006-01-28 21:44:33Z jilles $
|
* $Id: m_trace.c 3183 2007-02-01 01:07:42Z jilles $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
|
@ -59,7 +59,7 @@ mapi_hlist_av1 trace_hlist[] = {
|
||||||
{ "doing_trace", &doing_trace_hook },
|
{ "doing_trace", &doing_trace_hook },
|
||||||
{ NULL, NULL }
|
{ NULL, NULL }
|
||||||
};
|
};
|
||||||
DECLARE_MODULE_AV1(trace, NULL, NULL, trace_clist, trace_hlist, NULL, "$Revision: 609 $");
|
DECLARE_MODULE_AV1(trace, NULL, NULL, trace_clist, trace_hlist, NULL, "$Revision: 3183 $");
|
||||||
|
|
||||||
static void count_downlinks(struct Client *server_p, int *pservcount, int *pusercount);
|
static void count_downlinks(struct Client *server_p, int *pservcount, int *pusercount);
|
||||||
static int report_this_status(struct Client *source_p, struct Client *target_p, int dow);
|
static int report_this_status(struct Client *source_p, struct Client *target_p, int dow);
|
||||||
|
@ -115,7 +115,7 @@ m_trace(struct Client *client_p, struct Client *source_p, int parc, const char *
|
||||||
{
|
{
|
||||||
ac2ptr = ptr->data;
|
ac2ptr = ptr->data;
|
||||||
|
|
||||||
if(match(tname, ac2ptr->name) || match(ac2ptr->name, tname))
|
if(match(tname, ac2ptr->name))
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
ac2ptr = NULL;
|
ac2ptr = NULL;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||||
* USA
|
* USA
|
||||||
*
|
*
|
||||||
* $Id: s_serv.c 3181 2007-02-01 00:49:07Z jilles $
|
* $Id: s_serv.c 3183 2007-02-01 01:07:42Z jilles $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "stdinc.h"
|
#include "stdinc.h"
|
||||||
|
@ -260,8 +260,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
|
||||||
* Assume it's me, if no server
|
* Assume it's me, if no server
|
||||||
*/
|
*/
|
||||||
if(parc <= server || EmptyString(parv[server]) ||
|
if(parc <= server || EmptyString(parv[server]) ||
|
||||||
match(me.name, parv[server]) || match(parv[server], me.name) ||
|
match(parv[server], me.name) || (strcmp(parv[server], me.id) == 0))
|
||||||
(strcmp(parv[server], me.id) == 0))
|
|
||||||
return (HUNTED_ISME);
|
return (HUNTED_ISME);
|
||||||
|
|
||||||
new = LOCAL_COPY(parv[server]);
|
new = LOCAL_COPY(parv[server]);
|
||||||
|
|
Loading…
Reference in New Issue