fixed ssl.c bug when ssl backend returns IO_BLOCKED but IO engine doesn't get informe...

[ircu2.10.12-pk.git] / ircd / m_webirc.c

diff --git a/ircd/m_webirc.c b/ircd/m_webirc.c
index 6f05d2ceb1bb9fbf4aa1c78dfdb8755e95d92974..13fbd6e5f05929dbef428ea61c4b3c9bef6cabbc 100644 (file)
--- a/ircd/m_webirc.c
+++ b/ircd/m_webirc.c
@@ -47,7 +47,6 @@ static unsigned int webirc_pwmatch(const char* to_match, const char* passwd) {
     crypted = ircd_crypt(to_match, passwd);
     if(!crypted)
         return 0;
-    Debug((DEBUG_NOTICE, "WebIRC: Passwort check: %s = %s", crypted, passwd));
     res = strcmp(crypted, passwd);
     MyFree(crypted);
     return 0 == res;
@@ -62,7 +61,6 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
     unsigned int matched = 0;
 
     if(!GlobalWebIRCConf) {
-        Debug((DEBUG_NOTICE, "WebIRC: no global webirc conf"));
         return NULL;
     }
 
@@ -76,7 +74,6 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
                 /* it's a sorted list an passwords are stored first! */
 
                 if(inode->type != WEBIRC_PASS) break;
-                Debug((DEBUG_NOTICE, "WebIRC: pass: %s",inode->content));
                 if(webirc_pwmatch(passwd, inode->content)) {
                     matched = 1;
                     break;
@@ -88,9 +85,6 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
             /* go to next entry */
             inode = inode->next;
 
-            if(!matched)
-                Debug((DEBUG_NOTICE, "WebIRC: Password missmatch"));
-
             /* check for matching real-host/ip */
             if(matched) {
                 matched = 0;
@@ -113,8 +107,6 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
 
                     inode = inode->next;
                 } while(inode != iter->list);
-                if(!matched)
-                    Debug((DEBUG_NOTICE, "WebIRC: host missmatch"));
             }
 
             /* check for matching spoofed host/ip */
@@ -135,8 +127,6 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
 
                     inode = inode->next;
                 } while(inode != iter->list);
-                if(!matched)
-                    Debug((DEBUG_NOTICE, "WebIRC: spoof missmatch"));
             }
 
             if(matched) return iter;
@@ -154,7 +144,7 @@ static struct webirc_block *webirc_match(const char *passwd, const char *real_ho
  *
  * parv[0] = sender prefix
  * parv[1] = password
- * parv[2] = "cgiirc"
+ * parv[2] = "cgiirc" (ignored)
  * parv[3] = hostname
  * parv[4] = ip
  */
@@ -179,18 +169,6 @@ int m_webirc(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) {
     if(parc < 5)
         return need_more_params(sptr, "WEBIRC");
 
-    if(strcmp(parv[2], "cgiirc")) {
-        if(feature_bool(FEAT_WEBIRC_REJECT)) {
-            IPcheck_connect_fail(sptr);
-            return exit_client(cptr, sptr, &me, "WebIRC protocol violation (p2).");
-        }
-        else {
-            len = sprintf(webirc_buf, "NOTICE %s :%sWebIRC protocol violation (p2).\r\n", nick, auth ? "*** " : "");
-            webirc_resp(sptr, webirc_buf, len);
-            return 0; /* continue with normal authentication */
-        }
-    }
-
     /* created ip in dotted notation */
     con_addr = ircd_ntoa(&(cli_ip(sptr)));
     if(0 == ipmask_parse(parv[4], &addr, NULL)) {