[IRC-Dev CVS] SF.net SVN: irc-dev:[204] ircd/trunk/ircd

[<zo...@us...>]

Revision: 204
          http://irc-dev.svn.sourceforge.net/irc-dev/?rev=204&view=rev
Author:   zolty
Date:     2008-08-18 19:26:23 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
TRansicion vhosts

Modified Paths:
--------------
    ircd/trunk/ircd/ddb_events.c
    ircd/trunk/ircd/m_die.c
    ircd/trunk/ircd/s_user.c

Modified: ircd/trunk/ircd/ddb_events.c
===================================================================
--- ircd/trunk/ircd/ddb_events.c	2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/ddb_events.c	2008-08-18 19:26:23 UTC (rev 204)
@@ -32,6 +32,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
+#include "ircd_features.h"
 #include "ircd_snprintf.h"
 #include "ircd_tea.h"
 #include "msg.h"
@@ -270,14 +271,14 @@
     tempa[0] = keytemp;
     tempa[1] = content;
 
-    feature_set(&me, tempa, 2);
+    feature_set(&me, (const char * const *)tempa, 2);
   }
   else
   {
     char *tempb[1];
     tempb[0] = keytemp;
     
-    feature_set(&me, tempb, 1);
+    feature_set(&me, (const char * const *)tempb, 1);
   }
 }
     
@@ -518,11 +519,22 @@
 {
   if (content)
   {
+#if 1 /* TRANSICION IRC-HISPANO */
+    if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ? 
+           "numero.maximo.de.clones.por.defecto" : DDB_CONFIGDB_MAX_CLONES_PER_IP))
+      max_clones = atoi(content);
+    else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+           "mensaje.de.demasiados.clones" : DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
+      msg_many_clones = content;
+    else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+           "clave.de.cifrado.de.ips" : DDB_CONFIGDB_IP_CRYPT_KEY))                    
+#else  
     if (!strcmp(key, DDB_CONFIGDB_MAX_CLONES_PER_IP))
       max_clones = atoi(content);
     else if (!strcmp(key, DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
       msg_many_clones = content;
     else if (!strcmp(key, DDB_CONFIGDB_IP_CRYPT_KEY))
+#endif    
     {
       char keytmp[12 + 1];
       char c;
@@ -539,11 +551,22 @@
   }
   else
   {
+#if 1 /* TRANSICION IRC-HISPANO */
+    if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+           "numero.maximo.de.clones.por.defecto" : DDB_CONFIGDB_MAX_CLONES_PER_IP))
+      max_clones = 0;
+    else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+           "mensaje.de.demasiados.clones" : DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
+      msg_many_clones = NULL;
+    else if (!strcmp(key, feature_bool(FEAT_TRANSICION_HISPANO) ?
+           "clave.de.cifrado.de.ips" : DDB_CONFIGDB_IP_CRYPT_KEY))
+#else  
     if (!strcmp(key, DDB_CONFIGDB_MAX_CLONES_PER_IP))
       max_clones = 0;
     else if (!strcmp(key, DDB_CONFIGDB_MSG_TOO_MANY_FROM_IP))
       msg_many_clones = NULL;
     else if (!strcmp(key, DDB_CONFIGDB_IP_CRYPT_KEY))
+#endif    
     {
       ip_crypt_key = NULL;
       binary_ip_crypt_key[0] = 0;

Modified: ircd/trunk/ircd/m_die.c
===================================================================
--- ircd/trunk/ircd/m_die.c	2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/m_die.c	2008-08-18 19:26:23 UTC (rev 204)
@@ -122,7 +122,7 @@
     reason = parv[parc - 1];
 
   /* now, let's schedule the exit */
-  exit_schedule(0, 0, 0, "Received DIE");
+  exit_schedule(0, when, sptr, reason);
 
   return 0;
 }

Modified: ircd/trunk/ircd/s_user.c
===================================================================
--- ircd/trunk/ircd/s_user.c	2008-08-15 22:09:38 UTC (rev 203)
+++ ircd/trunk/ircd/s_user.c	2008-08-18 19:26:23 UTC (rev 204)
@@ -1248,7 +1248,6 @@
         ipcrypted[6] = '.';
         inttobase64(ipcrypted + 7, x[1], 6);
         strncpy(ipcrypted + 13, ".v4", HOSTLEN);
-        log_write(LS_SYSTEM, L_CRIT, 0, "%u - %u", x[0], x[1]);
 
         /* No deber\xEDa ocurrir nunca... */
         if (++ts == 65535)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.