[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.

diff --git a/ChangeLog b/ChangeLog
index 3f85a6bc8b001d6a94fed45eca7283ffffd0f196..58b5b69a30e7e92e2c142443e835533ab2fb67af 100644 (file)
--- a/ChangeLog
+++ b/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)
   Log:
   Remove server_exists() which checked whether the

diff --git a/include/serno.h b/include/serno.h
index df9d55446072be70582e618de46de60fc03e29c6..bcf812483e82558a08a70698e69e0b6bc49268d6 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070201-3179"
+#define SERNO "20070201-3181"

diff --git a/modules/m_trace.c b/modules/m_trace.c
index 27ee58cdf450b45eda656761f00985c316935647..3d62f68592122e01747fd39bc92ceabcb6fcf5f3 100644 (file)
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  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"
@@ -59,7 +59,7 @@ mapi_hlist_av1 trace_hlist[] = {
        { "doing_trace",        &doing_trace_hook },
        { 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 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;
 
-                                       if(match(tname, ac2ptr->name) || match(ac2ptr->name, tname))
+                                       if(match(tname, ac2ptr->name))
                                                break;
                                        else
                                                ac2ptr = NULL;

diff --git a/src/s_serv.c b/src/s_serv.c
index 8ea6c667f02e87f6d2f156e07286645efbdc173b..9df924d6b65512e72d764d39d6bd56f03ba28df8 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  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"
@@ -260,8 +260,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
         * Assume it's me, if no server
         */
        if(parc <= server || EmptyString(parv[server]) ||
-          match(me.name, parv[server]) || match(parv[server], me.name) ||
-          (strcmp(parv[server], me.id) == 0))
+          match(parv[server], me.name) || (strcmp(parv[server], me.id) == 0))
                return (HUNTED_ISME);
        
        new = LOCAL_COPY(parv[server]);