[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed

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

Committer  : zolty
CVSROOT    : /cvsroot/irc-dev
Module     : ircd-ircdev
Commit time: 2008-01-19 13:29:04 UTC

Modified files:
     acinclude.m4 include/gline.h include/ircd_events.h ircd/channel.c
     ircd/class.c ircd/gline.c ircd/ircd_events.c ircd/ircd_features.c
     ircd/m_burst.c ircd/m_endburst.c ircd/m_list.c ircd/m_lusers.c
     ircd/m_mode.c ircd/m_names.c ircd/m_nick.c ircd/m_server.c
     ircd/m_version.c ircd/s_auth.c ircd/s_conf.c ircd/s_err.c
     ircd/s_misc.c ircd/s_stats.c ircd/s_user.c tools/iauth-test

Log message:

Limpieza de código

---------------------- diff included ----------------------
Index: ircd-ircdev/acinclude.m4
diff -u ircd-ircdev/acinclude.m4:1.4 ircd-ircdev/acinclude.m4:1.5
--- ircd-ircdev/acinclude.m4:1.4	Sun Apr 22 06:56:17 2007
+++ ircd-ircdev/acinclude.m4	Sat Jan 19 05:28:51 2008
@@ -211,10 +211,10 @@
 AC_DEFUN([unet_TOGGLE],
 [AC_MSG_CHECKING([$4])
 AC_ARG_ENABLE([$1],
-       AS_HELP_STRING([--m4_if($2, no, enable, disable)-$1], [$3]),
-       [unet_cv_enable_$1=$enableval],
-       [AC_CACHE_VAL(unet_cv_enable_$1,
-               [unet_cv_enable_$1=$2])])
+	AS_HELP_STRING([--m4_if($2, no, enable, disable)-$1], [$3]),
+	[unet_cv_enable_$1=$enableval],
+	[AC_CACHE_VAL(unet_cv_enable_$1,
+		[unet_cv_enable_$1=$2])])
 
 m4_if($5, , , $5)
 AC_MSG_RESULT([$unet_cv_enable_$1])])
@@ -229,9 +229,9 @@
 AC_DEFUN([unet_VALUE],
 [AC_MSG_CHECKING([$4])
 AC_ARG_WITH([$1], AS_HELP_STRING([--with-$1], [$3]),
-       [unet_cv_with_$1=$withval],
-       [AC_CACHE_VAL(unet_cv_with_$1,
-               [unet_cv_with_$1=$2])])
+	[unet_cv_with_$1=$withval],
+	[AC_CACHE_VAL(unet_cv_with_$1,
+		[unet_cv_with_$1=$2])])
 
 m4_if($5, , , $5)
 AC_MSG_RESULT([$unet_cv_with_$1])])
Index: ircd-ircdev/include/gline.h
diff -u ircd-ircdev/include/gline.h:1.7 ircd-ircdev/include/gline.h:1.8
--- ircd-ircdev/include/gline.h:1.7	Tue Dec 11 15:38:23 2007
+++ ircd-ircdev/include/gline.h	Sat Jan 19 05:28:51 2008
@@ -23,7 +23,7 @@
  */
 /** @file
  * @brief Structures and APIs for G-line manipulation.
- * @version $Id: gline.h,v 1.7 2007/12/11 23:38:23 zolty Exp $
+ * @version $Id: gline.h,v 1.8 2008/01/19 13:28:51 zolty Exp $
  */
 #ifndef INCLUDED_gline_h
 #define INCLUDED_gline_h
@@ -44,34 +44,34 @@
 
 /** Local state of a G-line. */
 enum GlineLocalState {
-  GLOCAL_GLOBAL,               /**< G-line state unmodified locally. */
-  GLOCAL_ACTIVATED,            /**< G-line state locally activated. */
-  GLOCAL_DEACTIVATED           /**< G-line state locally deactivated. */
+  GLOCAL_GLOBAL,		/**< G-line state unmodified locally. */
+  GLOCAL_ACTIVATED,		/**< G-line state locally activated. */
+  GLOCAL_DEACTIVATED		/**< G-line state locally deactivated. */
 };
 
 /** Description of a G-line. */
 struct Gline {
-  struct Gline *gl_next;       /**< Next G-line in linked list. */
-  struct Gline**gl_prev_p;     /**< Previous pointer to this G-line. */
-  char        *gl_user;        /**< Username mask (or channel/realname mask). */
-  char        *gl_host;        /**< Host prtion of mask. */
-  char        *gl_reason;      /**< Reason for G-line. */
-  time_t       gl_expire;      /**< Expiration timestamp. */
-  time_t       gl_lastmod;     /**< Last modification timestamp. */
-  time_t       gl_lifetime;    /**< Record expiration timestamp. */
-  struct irc_in_addr gl_addr;  /**< IP address (for IP-based G-lines). */
-  unsigned char gl_bits;       /**< Usable bits in gl_addr. */
-  unsigned int gl_flags;       /**< G-line status flags. */
+  struct Gline *gl_next;	/**< Next G-line in linked list. */
+  struct Gline**gl_prev_p;	/**< Previous pointer to this G-line. */
+  char	       *gl_user;	/**< Username mask (or channel/realname mask). */
+  char	       *gl_host;	/**< Host prtion of mask. */
+  char	       *gl_reason;	/**< Reason for G-line. */
+  time_t	gl_expire;	/**< Expiration timestamp. */
+  time_t	gl_lastmod;	/**< Last modification timestamp. */
+  time_t	gl_lifetime;	/**< Record expiration timestamp. */
+  struct irc_in_addr gl_addr;	/**< IP address (for IP-based G-lines). */
+  unsigned char gl_bits;	/**< Usable bits in gl_addr. */
+  unsigned int	gl_flags;	/**< G-line status flags. */
   enum GlineLocalState gl_state;/**< G-line local state. */
 };
 
 /** Action to perform on a G-line. */
 enum GlineAction {
-  GLINE_ACTIVATE,              /**< G-line should be activated. */
-  GLINE_DEACTIVATE,            /**< G-line should be deactivated. */
-  GLINE_LOCAL_ACTIVATE,                /**< G-line should be locally activated. */
-  GLINE_LOCAL_DEACTIVATE,      /**< G-line should be locally deactivated. */
-  GLINE_MODIFY                 /**< G-line should be modified. */
+  GLINE_ACTIVATE,		/**< G-line should be activated. */
+  GLINE_DEACTIVATE,		/**< G-line should be deactivated. */
+  GLINE_LOCAL_ACTIVATE,		/**< G-line should be locally activated. */
+  GLINE_LOCAL_DEACTIVATE,	/**< G-line should be locally deactivated. */
+  GLINE_MODIFY			/**< G-line should be modified. */
 };
 
 #define GLINE_ACTIVE	0x0001  /**< G-line is active. */
@@ -87,9 +87,9 @@
 #define GLINE_OPERFORCE	0x0400	/**< Oper forcing G-line to be set. */
 #define GLINE_REALNAME  0x0800  /**< G-line matches only the realname field. */
 
-#define GLINE_EXPIRE   0x1000  /**< Expiration time update */
-#define GLINE_LIFETIME 0x2000  /**< Record lifetime update */
-#define GLINE_REASON   0x4000  /**< Reason update */
+#define GLINE_EXPIRE	0x1000	/**< Expiration time update */
+#define GLINE_LIFETIME	0x2000	/**< Record lifetime update */
+#define GLINE_REASON	0x4000	/**< Reason update */
 
 /** Controllable flags that can be set on an actual G-line. */
 #define GLINE_MASK	(GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL | GLINE_REALNAME)
@@ -97,12 +97,12 @@
 #define GLINE_ACTMASK	(GLINE_ACTIVE | GLINE_LDEACT)
 
 /** Mask for G-line update flags. */
-#define GLINE_UPDATE   (GLINE_EXPIRE | GLINE_LIFETIME | GLINE_REASON)
+#define GLINE_UPDATE	(GLINE_EXPIRE | GLINE_LIFETIME | GLINE_REASON)
 
 /** Test whether \a g is active. */
-#define GlineIsActive(g)	((((g)->gl_flags & GLINE_ACTIVE) &&       \
+#define GlineIsActive(g)	((((g)->gl_flags & GLINE_ACTIVE) &&	  \
 				  (g)->gl_state != GLOCAL_DEACTIVATED) || \
-				(g)->gl_state == GLOCAL_ACTIVATED)
+				 (g)->gl_state == GLOCAL_ACTIVATED)
 /** Test whether \a g is remotely (globally) active. */
 #define GlineIsRemActive(g)	((g)->gl_flags & GLINE_ACTIVE)
 /** Test whether \a g is an IP-based G-line. */
@@ -137,7 +137,7 @@
 			char *reason, time_t expire, time_t lastmod,
 			time_t lifetime, unsigned int flags);
 extern int gline_destroy(struct Client *cptr, struct Client *sptr,
-			struct Gline *gline);
+			 struct Gline *gline);
 extern struct Gline *gline_find(char *userhost, unsigned int flags);
 extern struct Gline *gline_lookup(struct Client *cptr, unsigned int flags);
 extern void gline_free(struct Gline *gline);
Index: ircd-ircdev/include/ircd_events.h
diff -u ircd-ircdev/include/ircd_events.h:1.7 ircd-ircdev/include/ircd_events.h:1.8
--- ircd-ircdev/include/ircd_events.h:1.7	Tue Dec 11 15:38:23 2007
+++ ircd-ircdev/include/ircd_events.h	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Interface and public definitions for event loop.
- * @version $Id: ircd_events.h,v 1.7 2007/12/11 23:38:23 zolty Exp $
+ * @version $Id: ircd_events.h,v 1.8 2008/01/19 13:28:51 zolty Exp $
  */
 #ifndef INCLUDED_ircd_events_h
 #define INCLUDED_ircd_events_h
@@ -213,9 +213,9 @@
 
 /** List of all event generators. */
 struct Generators {
-  struct GenHeader* g_socket;  /**< list of socket generators */
-  struct GenHeader* g_signal;  /**< list of signal generators */
-  struct GenHeader* g_timer;   /**< list of timer generators */
+  struct GenHeader* g_socket;	/**< list of socket generators */
+  struct GenHeader* g_signal;	/**< list of signal generators */
+  struct GenHeader* g_timer;	/**< list of timer generators */
 };
 
 /** Returns 1 if successfully initialized, 0 if not.
@@ -295,7 +295,6 @@
 void timer_chg(struct Timer* timer, enum TimerType type, time_t value);
 void timer_run(void);
 /** Retrieve the next timer's expiration time from Generators \a gen. */
-
 #define timer_next(gen)	((gen)->g_timer ? ((struct Timer*)(gen)->g_timer)->t_expire : 0)
 
 void signal_add(struct Signal* signal, EventCallBack call, void* data,
Index: ircd-ircdev/ircd/channel.c
diff -u ircd-ircdev/ircd/channel.c:1.35 ircd-ircdev/ircd/channel.c:1.36
--- ircd-ircdev/ircd/channel.c:1.35	Sun Jan  6 16:14:05 2008
+++ ircd-ircdev/ircd/channel.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Channel management and maintanance
- * @version $Id: channel.c,v 1.35 2008/01/07 00:14:05 zolty Exp $
+ * @version $Id: channel.c,v 1.36 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -715,8 +715,7 @@
   }
 
 #if defined(UNDERNET)
-  /* Discourage using the Apass to get op.  They should use the upass. */
-
+  /* Discourage using the Apass to get op.  They should use the Upass. */
   if (IsChannelManager(member) && member->channel->mode.apass[0])
     return 0;
 #endif
@@ -1996,21 +1995,20 @@
       if (mbuf->mb_dest & MODEBUF_DEST_BOTMODE)
         sendcmdbotto_channel(ddb_get_botname(mbuf->mb_botname),
                              CMD_MODE, mbuf->mb_channel, NULL, 0,
-                             "%H %s%s%s%s%s%s", mbuf->mb_channel,
-                             rembuf_i ? "-" : "", rembuf,
-                             addbuf_i ? "+" : "", addbuf, remstr, addstr);
+                             "%H %s%s%s%s%s%s%s%s", mbuf->mb_channel,
+                             rembuf_i || rembuf_local_i ? "-" : "",
+                             rembuf, rembuf_local,
+                             addbuf_i || addbuf_local_i ? "+" : "",
+                             addbuf, addbuf_local,
+                             remstr, addstr);                             
       else
 #endif /* defined(DDB) */
       sendcmdto_channel(app_source, CMD_MODE, mbuf->mb_channel, NULL, SKIP_SERVERS,
                         "%H %s%s%s%s%s%s%s%s", mbuf->mb_channel,
-/* TODO-ZOLTAN: Revisar */                        
-/*                        rembuf_i || rembuf_local_i ? "-" : "",
+                        rembuf_i || rembuf_local_i ? "-" : "",
                         rembuf, rembuf_local,
                         addbuf_i || addbuf_local_i ? "+" : "",
                         addbuf, addbuf_local,
-*/
-			rembuf_i ? "-" : "", rembuf,
-                        addbuf_i ? "+" : "", addbuf,
                         remstr, addstr);
     }
   }
@@ -2174,8 +2172,7 @@
   assert(0 != chan);
   assert(0 != dest);
 
-  if (IsLocalChannel(chan->chname)) 
-    dest &= ~MODEBUF_DEST_SERVER;
+  if (IsLocalChannel(chan->chname)) dest &= ~MODEBUF_DEST_SERVER;
 
   mbuf->mb_add = 0;
   mbuf->mb_rem = 0;
@@ -2211,11 +2208,11 @@
   mode &= (MODE_ADD | MODE_DEL | MODE_PRIVATE | MODE_SECRET | MODE_MODERATED |
 	   MODE_TOPICLIMIT | MODE_INVITEONLY | MODE_NOPRIVMSGS | MODE_REGONLY |
 #if defined(DDB) || defined(SERVICES)
-/* TODO-ZOLTAN: Revisar */
-/*        MODE_REGCHAN | */
+           MODE_REGCHAN |
 #endif
-           MODE_DELJOINS | MODE_WASDELJOINS | MODE_NOQUITPARTS  | MODE_NOCOLOUR |
-           MODE_NOCTCP | MODE_NONOTICE | MODE_NOMULTITARGET | MODE_MODERATENOREG);
+           MODE_NOCTCP | MODE_NONOTICE | MODE_NOMULTITARGET | 
+           MODE_NOQUITPARTS  | MODE_NOCOLOUR | MODE_MODERATENOREG |
+           MODE_DELJOINS | MODE_WASDELJOINS);
 
   if (!(mode & ~(MODE_ADD | MODE_DEL))) /* don't add empty modes... */
     return;
@@ -2368,13 +2365,13 @@
 /*  MODE_BAN,		'b', */
     MODE_LIMIT,		'l',
 #if defined(UNDERNET)
-    MODE_REGONLY,       'r',
+    MODE_REGONLY,	'r',
 #elif defined(DDB) || defined(SERVICES)
     MODE_REGCHAN,	'r',
     MODE_REGONLY,       'R',
 /*  MODE_OWNER,		'q', */
 #endif
-    MODE_DELJOINS,	'D',
+    MODE_DELJOINS,      'D',
     MODE_NOQUITPARTS,   'u',
     MODE_NOCOLOUR,      'c',
     MODE_NOCTCP,        'C',
@@ -2970,7 +2967,6 @@
 	 channel manager) during a net.break, and only sets the Apass
 	 after the net rejoined, they will have oplevel MAXOPLEVEL on
 	 all remote servers. */
-
       if (state->member)
         SetOpLevel(state->member, 0);
     } else { /* remove the old apass */
@@ -3534,13 +3530,13 @@
     MODE_BAN,		'b',
     MODE_LIMIT,		'l',
 #if defined(UNDERNET)
-    MODE_REGONLY,       'r',
+    MODE_REGONLY,	'r',
 #elif defined(DDB) || defined(SERVICES)
     MODE_OWNER,		'q',
     MODE_REGCHAN,	'r',
     MODE_REGONLY,       'R',
 #endif
-    MODE_DELJOINS,	'D',
+    MODE_DELJOINS,      'D',
     MODE_NOQUITPARTS,   'u',
     MODE_NOCOLOUR,      'c',
     MODE_NOCTCP,        'C',
Index: ircd-ircdev/ircd/class.c
diff -u ircd-ircdev/ircd/class.c:1.14 ircd-ircdev/ircd/class.c:1.15
--- ircd-ircdev/ircd/class.c:1.14	Tue Dec 11 15:38:24 2007
+++ ircd-ircdev/ircd/class.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Implementation of connection class handling functions.
- * @version $Id: class.c,v 1.14 2007/12/11 23:38:24 zolty Exp $
+ * @version $Id: class.c,v 1.15 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -229,7 +229,7 @@
   PingFreq(p) = ping;
   MaxLinks(p) = maxli;
   MaxSendq(p) = (sendq > 0U) ?
-     sendq : feature_uint(FEAT_DEFAULTMAXSENDQLENGTH);
+    sendq : feature_uint(FEAT_DEFAULTMAXSENDQLENGTH);
   p->valid = 1;
 }
 
Index: ircd-ircdev/ircd/gline.c
diff -u ircd-ircdev/ircd/gline.c:1.22 ircd-ircdev/ircd/gline.c:1.23
--- ircd-ircdev/ircd/gline.c:1.22	Tue Dec 11 15:38:24 2007
+++ ircd-ircdev/ircd/gline.c	Sat Jan 19 05:28:51 2008
@@ -23,7 +23,7 @@
  */
 /** @file
  * @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.22 2007/12/11 23:38:24 zolty Exp $
+ * @version $Id: gline.c,v 1.23 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -383,7 +383,7 @@
  * @param[in] gline G-line to forward.
  * @return Zero.
  */
-int
+static int
 gline_propagate(struct Client *cptr, struct Client *sptr, struct Gline *gline)
 {
   if (GlineIsLocal(gline))
Index: ircd-ircdev/ircd/ircd_events.c
diff -u ircd-ircdev/ircd/ircd_events.c:1.12 ircd-ircdev/ircd/ircd_events.c:1.13
--- ircd-ircdev/ircd/ircd_events.c:1.12	Tue Dec 11 15:38:24 2007
+++ ircd-ircdev/ircd/ircd_events.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Implementation of event loop mid-layer.
- * @version $Id: ircd_events.c,v 1.12 2007/12/11 23:38:24 zolty Exp $
+ * @version $Id: ircd_events.c,v 1.13 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -381,7 +381,7 @@
     sig = (int) sigstr[i]; /* get signal */
 
     for (ptr = evInfo.gens.g_signal; ptr;
-        ptr = ptr->gh_next)
+	 ptr = ptr->gh_next)
       if (((struct Signal*)ptr)->sig_signal == sig) /* find its descriptor... */
 	break;
 
Index: ircd-ircdev/ircd/ircd_features.c
diff -u ircd-ircdev/ircd/ircd_features.c:1.23 ircd-ircdev/ircd/ircd_features.c:1.24
--- ircd-ircdev/ircd/ircd_features.c:1.23	Tue Dec 11 15:38:24 2007
+++ ircd-ircdev/ircd/ircd_features.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Implementation of configurable feature support.
- * @version $Id: ircd_features.c,v 1.23 2007/12/11 23:38:24 zolty Exp $
+ * @version $Id: ircd_features.c,v 1.24 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -844,7 +844,7 @@
 
     case FEAT_UINT: /* unsigned integer, report its value */
       send_reply(from, SND_EXPLICIT | RPL_FEATURE,
-                ":Unsigned value of %s: %u", feat->type, feat->v_int);
+		 ":Unsigned value of %s: %u", feat->type, feat->v_int);
       break;
 
     case FEAT_BOOL: /* boolean, report boolean value */
@@ -987,8 +987,8 @@
 
     case FEAT_UINT: /* Report an F-line with unsigned values */
       if (features[i].flags & FEAT_MARK) /* it's been changed */
-       send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %u",
-                  features[i].type, features[i].v_int);
+	send_reply(to, SND_EXPLICIT | RPL_STATSFLINE, "F %s %u",
+		   features[i].type, features[i].v_int);
       break;
 
     case FEAT_BOOL: /* Report an F-line with boolean values */
Index: ircd-ircdev/ircd/m_burst.c
diff -u ircd-ircdev/ircd/m_burst.c:1.22 ircd-ircdev/ircd/m_burst.c:1.23
--- ircd-ircdev/ircd/m_burst.c:1.22	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_burst.c	Sat Jan 19 05:28:51 2008
@@ -22,7 +22,7 @@
  */
 /** @file
  * @brief Handlers for BURST command.
- * @version $Id: m_burst.c,v 1.22 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_burst.c,v 1.23 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -85,7 +85,11 @@
     case 'l':
       ++parv;
       break;
+#if defined(UNDERNET)
+    case 'r':
+#else
     case 'R':
+#endif
       result |= MODE_REGONLY;
       break;
     }
@@ -307,6 +311,7 @@
 #if defined(UNDERNET)
     member->status &= ~(CHFL_BURST_JOINED|CHFL_BURST_ALREADY_OPPED|CHFL_BURST_ALREADY_VOICED);
 #else
+	/* TODO-ZOLTAN */
     member->status &= ~CHFL_BURST_JOINED;
 #endif
 
Index: ircd-ircdev/ircd/m_endburst.c
diff -u ircd-ircdev/ircd/m_endburst.c:1.9 ircd-ircdev/ircd/m_endburst.c:1.10
--- ircd-ircdev/ircd/m_endburst.c:1.9	Thu Sep 20 14:00:32 2007
+++ ircd-ircdev/ircd/m_endburst.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for END OF BURST command.
- * @version $Id: m_endburst.c,v 1.9 2007/09/20 21:00:32 zolty Exp $
+ * @version $Id: m_endburst.c,v 1.10 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -79,7 +79,7 @@
       /* Newly empty channel, schedule it for removal. */
       chan->mode.mode &= ~MODE_BURSTADDED;
       sub1_from_channel(chan);
-    } else {
+   } else {
       chan->mode.mode &= ~MODE_BURSTADDED;
 #if !defined(UNDERNET) && !defined(DDB)
       sendto_opmask(0, SNO_OLDSNO, "Empty channel %H not added by "
Index: ircd-ircdev/ircd/m_list.c
diff -u ircd-ircdev/ircd/m_list.c:1.13 ircd-ircdev/ircd/m_list.c:1.14
--- ircd-ircdev/ircd/m_list.c:1.13	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_list.c	Sat Jan 19 05:28:51 2008
@@ -20,7 +20,7 @@
  */
 /** @file
  * @brief Handlers for LIST command.
- * @version $Id: m_list.c,v 1.13 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_list.c,v 1.14 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -202,9 +202,9 @@
 
       case 2: /* channel topic */
 	if (dir == '<')
-	  args->min_topic_time = val;
-	else
 	  args->max_topic_time = val;
+	else
+	  args->min_topic_time = val;
 	break;
       }
       break;
Index: ircd-ircdev/ircd/m_lusers.c
diff -u ircd-ircdev/ircd/m_lusers.c:1.10 ircd-ircdev/ircd/m_lusers.c:1.11
--- ircd-ircdev/ircd/m_lusers.c:1.10	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_lusers.c	Sat Jan 19 05:28:51 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for LUSERS command.
- * @version $Id: m_lusers.c,v 1.10 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_lusers.c,v 1.11 2008/01/19 13:28:51 zolty Exp $
  */
 #include "config.h"
 
@@ -65,7 +65,7 @@
 
   assert(UserStats.inv_clients <= UserStats.clients + UserStats.unknowns);
 
-  send_reply(sptr, RPL_LUSERCLIENT,
+  send_reply(sptr, RPL_LUSERCLIENT, 
 	     UserStats.clients - UserStats.inv_clients + UserStats.unknowns,
 	     UserStats.inv_clients, UserStats.servers);
   if (longoutput && UserStats.opers)
Index: ircd-ircdev/ircd/m_mode.c
diff -u ircd-ircdev/ircd/m_mode.c:1.16 ircd-ircdev/ircd/m_mode.c:1.17
--- ircd-ircdev/ircd/m_mode.c:1.16	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_mode.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for MODE command.
- * @version $Id: m_mode.c,v 1.16 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_mode.c,v 1.17 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -166,7 +166,7 @@
     }
     else if (sptr != acptr)
     {
-      sendwallto_group(&me, WALL_WALLOPS, 0,
+      sendwallto_group(&me, WALL_WALLOPS, 0, 
                        "MODE for User %s from %s!%s", parv[1],
                        cli_name(cptr), cli_name(sptr));
       return 0;
Index: ircd-ircdev/ircd/m_names.c
diff -u ircd-ircdev/ircd/m_names.c:1.15 ircd-ircdev/ircd/m_names.c:1.16
--- ircd-ircdev/ircd/m_names.c:1.15	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_names.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for NAMES command.
- * @version $Id: m_names.c,v 1.15 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_names.c,v 1.16 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -122,7 +122,7 @@
       buf[idx++] = '@';
     else if (HasVoice(member))
       buf[idx++] = '+';
-    strcpy(buf + idx, cli_name(c2ptr)); 
+    strcpy(buf + idx, cli_name(c2ptr));
     idx += strlen(cli_name(c2ptr));
     flag = 1;
     if (mlen + idx + NICKLEN + 5 > BUFSIZE)
@@ -234,7 +234,7 @@
 
         if (showflag)               /* Have we already shown them? */
           continue;
-
+ 
         strcpy(buf + idx, cli_name(c2ptr));
         idx += strlen(cli_name(c2ptr));
         buf[idx++] = ' ';
@@ -252,7 +252,7 @@
         send_reply(sptr, RPL_NAMREPLY, buf);
       send_reply(sptr, RPL_ENDOFNAMES, "*");
     }
-    else if ((chptr = FindChannel(para)) != NULL) 
+    else if ((chptr = FindChannel(para)) != NULL)
     {
       member = find_member_link(chptr, sptr);
       if (member)
Index: ircd-ircdev/ircd/m_nick.c
diff -u ircd-ircdev/ircd/m_nick.c:1.16 ircd-ircdev/ircd/m_nick.c:1.17
--- ircd-ircdev/ircd/m_nick.c:1.16	Tue Dec 11 15:38:25 2007
+++ ircd-ircdev/ircd/m_nick.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for NICK command.
- * @version $Id: m_nick.c,v 1.16 2007/12/11 23:38:25 zolty Exp $
+ * @version $Id: m_nick.c,v 1.17 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -169,11 +169,9 @@
   if (strlen(arg) > IRCD_MIN(NICKLEN, feature_uint(FEAT_NICKLEN)))
     arg[IRCD_MIN(NICKLEN, feature_uint(FEAT_NICKLEN))] = '\0';
 
-#if 1
   /* Soporte de nicks ~ */
   if ((s = strchr(arg, '~')))
     *s = '\0';
-#endif
 
   strcpy(nick, arg);
 
Index: ircd-ircdev/ircd/m_server.c
diff -u ircd-ircdev/ircd/m_server.c:1.14 ircd-ircdev/ircd/m_server.c:1.15
--- ircd-ircdev/ircd/m_server.c:1.14	Tue Dec 11 15:38:26 2007
+++ ircd-ircdev/ircd/m_server.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for the SERVER command.
- * @version $Id: m_server.c,v 1.14 2007/12/11 23:38:26 zolty Exp $
+ * @version $Id: m_server.c,v 1.15 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -622,7 +622,6 @@
   memset(cli_privs(cptr), 255, sizeof(struct Privs));
   ClrPriv(cptr, PRIV_SET);
   SetServerYXX(cptr, cptr, parv[6]);
-
   update_uworld_flags(cptr);
 
   if (*parv[7] == '+')
@@ -735,7 +734,6 @@
   /* Use cptr, because we do protocol 9 -> 10 translation
      for numeric nicks ! */
   SetServerYXX(cptr, acptr, parv[6]);
-
   update_uworld_flags(cptr);
 
   if (*parv[7] == '+')
Index: ircd-ircdev/ircd/m_version.c
diff -u ircd-ircdev/ircd/m_version.c:1.11 ircd-ircdev/ircd/m_version.c:1.12
--- ircd-ircdev/ircd/m_version.c:1.11	Tue Dec 11 15:38:26 2007
+++ ircd-ircdev/ircd/m_version.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Handlers for the VERSION command.
- * @version $Id: m_version.c,v 1.11 2007/12/11 23:38:26 zolty Exp $
+ * @version $Id: m_version.c,v 1.12 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -33,6 +33,7 @@
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
+#include "match.h"
 #include "msg.h"
 #include "numeric.h"
 #include "numnicks.h"
Index: ircd-ircdev/ircd/s_auth.c
diff -u ircd-ircdev/ircd/s_auth.c:1.20 ircd-ircdev/ircd/s_auth.c:1.21
--- ircd-ircdev/ircd/s_auth.c:1.20	Tue Dec 11 15:38:26 2007
+++ ircd-ircdev/ircd/s_auth.c	Sat Jan 19 05:28:53 2008
@@ -36,7 +36,7 @@
  */
 /** @file
  * @brief Implementation of DNS and ident lookups.
- * @version $Id: s_auth.c,v 1.20 2007/12/11 23:38:26 zolty Exp $
+ * @version $Id: s_auth.c,v 1.21 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -1983,8 +1983,8 @@
   case 'U': handler = iauth_cmd_username_good; has_cli = 1; break;
   case 'u': handler = iauth_cmd_username_bad; has_cli = 1; break;
   case 'N': handler = iauth_cmd_hostname; has_cli = 1; break;
-  case 'M': handler = iauth_cmd_usermode; has_cli = 1; break;
   case 'I': handler = iauth_cmd_ip_address; has_cli = 1; break;
+  case 'M': handler = iauth_cmd_usermode; has_cli = 1; break;
   case 'C': handler = iauth_cmd_challenge; has_cli = 1; break;
   case 'D': handler = iauth_cmd_done_client; has_cli = 1; break;
 #if defined(UNDERNET)
Index: ircd-ircdev/ircd/s_conf.c
diff -u ircd-ircdev/ircd/s_conf.c:1.30 ircd-ircdev/ircd/s_conf.c:1.31
--- ircd-ircdev/ircd/s_conf.c:1.30	Tue Dec 11 15:38:26 2007
+++ ircd-ircdev/ircd/s_conf.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief ircd configuration file driver
- * @version $Id: s_conf.c,v 1.30 2007/12/11 23:38:26 zolty Exp $
+ * @version $Id: s_conf.c,v 1.31 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -854,6 +854,7 @@
 static int conf_already_read;
 extern void yyparse(void);
 extern int init_lexer(const char *configfile);
+extern void deinit_lexer(void);
 
 /** Read configuration file.
  * @return Zero on failure, non-zero on success. */
Index: ircd-ircdev/ircd/s_err.c
diff -u ircd-ircdev/ircd/s_err.c:1.28 ircd-ircdev/ircd/s_err.c:1.29
--- ircd-ircdev/ircd/s_err.c:1.28	Sun Jan  6 16:14:06 2008
+++ ircd-ircdev/ircd/s_err.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Error handling support.
- * @version $Id: s_err.c,v 1.28 2008/01/07 00:14:06 zolty Exp $
+ * @version $Id: s_err.c,v 1.29 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -469,10 +469,7 @@
 /* 212 */
   { RPL_STATSCOMMANDS, "%s %u %u", "212" },
 /* 213 */
-/* TODO-ZOLTAN: OJO PROVISIONAL ZOLTAN
   { RPL_STATSCLINE, "C %s * %d %d %s %s", "213" },
-*/
-  { RPL_STATSCLINE, "C %s %s%s %d %d %s %s", "213" },
 /* 214 */
   { 0 },
 /* 215 */
Index: ircd-ircdev/ircd/s_misc.c
diff -u ircd-ircdev/ircd/s_misc.c:1.19 ircd-ircdev/ircd/s_misc.c:1.20
--- ircd-ircdev/ircd/s_misc.c:1.19	Tue Dec 11 15:38:26 2007
+++ ircd-ircdev/ircd/s_misc.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Miscellaneous support functions.
- * @version $Id: s_misc.c,v 1.19 2007/12/11 23:38:26 zolty Exp $
+ * @version $Id: s_misc.c,v 1.20 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -228,7 +228,6 @@
     if (MyUser(bcptr))
       set_snomask(bcptr, ~0, SNO_DEL);
 
-    if (IsInvisible(bcptr))
     if (IsInvisible(bcptr)) {
       assert(UserStats.inv_clients > 0);
       --UserStats.inv_clients;
Index: ircd-ircdev/ircd/s_stats.c
diff -u ircd-ircdev/ircd/s_stats.c:1.22 ircd-ircdev/ircd/s_stats.c:1.23
--- ircd-ircdev/ircd/s_stats.c:1.22	Thu Sep 20 14:00:32 2007
+++ ircd-ircdev/ircd/s_stats.c	Sat Jan 19 05:28:53 2008
@@ -22,7 +22,7 @@
 /** @file
  * @brief Report configuration lines and other statistics from this
  * server.
- * @version $Id: s_stats.c,v 1.22 2007/09/20 21:00:32 zolty Exp $
+ * @version $Id: s_stats.c,v 1.23 2008/01/19 13:28:53 zolty Exp $
  *
  * Note: The info is reported in the order the server uses
  *       it--not reversed as in ircd.conf!
@@ -72,7 +72,7 @@
 /** @file
  * @brief Report configuration lines and other statistics from this
  * server.
- * @version $Id: s_stats.c,v 1.22 2007/09/20 21:00:32 zolty Exp $
+ * @version $Id: s_stats.c,v 1.23 2008/01/19 13:28:53 zolty Exp $
  *
  * Note: The info is reported in the order the server uses
  *       it--not reversed as in ircd.conf!
@@ -243,10 +243,7 @@
       port = tmp->address.port;
 
       if (tmp->status & CONF_SERVER)
-/* TODO-ZOLTAN provisional ZOLTAN OJO
-        send_reply(sptr, RPL_STATSCLINE, name, port, maximum, hub_limit, get_conf_class(tmp));
-*/
-	send_reply(sptr, RPL_STATSCLINE, name, (host[0] == ':' ? "0" : ""), host, port, maximum, hub_limit, get_conf_class(tmp));
+	send_reply(sptr, RPL_STATSCLINE, name, port, maximum, hub_limit, get_conf_class(tmp));
       else if (tmp->status & CONF_CLIENT)
         send_reply(sptr, RPL_STATSILINE,
                    (tmp->username ? tmp->username : ""), (tmp->username ? "@" : ""),
Index: ircd-ircdev/ircd/s_user.c
diff -u ircd-ircdev/ircd/s_user.c:1.35 ircd-ircdev/ircd/s_user.c:1.36
--- ircd-ircdev/ircd/s_user.c:1.35	Sun Jan  6 16:14:07 2008
+++ ircd-ircdev/ircd/s_user.c	Sat Jan 19 05:28:53 2008
@@ -21,7 +21,7 @@
  */
 /** @file
  * @brief Miscellaneous user-related helper functions.
- * @version $Id: s_user.c,v 1.35 2008/01/07 00:14:07 zolty Exp $
+ * @version $Id: s_user.c,v 1.36 2008/01/19 13:28:53 zolty Exp $
  */
 #include "config.h"
 
@@ -1484,12 +1484,12 @@
 	break;
 #if defined(UNDERNET)
       case 'r':
-       if (what == MODE_ADD) {
-         account = *(++p);
-         SetAccount(sptr);
-       }
-       /* There is no -r */
-       break;
+	if (what == MODE_ADD) {
+	  account = *(++p);
+	  SetAccount(sptr);
+	}
+	/* There is no -r */
+	break;
 #endif
 #ifdef USE_SSL
       case 'Z':
@@ -1522,8 +1522,7 @@
        /* if none of the given case is valid then compain by
         * sending raw 501 ( ERR_UMODEUNKNOWNFLAG )
         */
-      default: 
-
+      default:
         send_reply(sptr, ERR_UMODEUNKNOWNFLAG, *m);
         break;
       }
@@ -1603,8 +1602,8 @@
 	len = (ts++) - account;
 	cli_user(sptr)->acc_create = atoi(ts);
 	Debug((DEBUG_DEBUG, "Received timestamped account in user mode; "
-	     "account \"%s\", timestamp %Tu", account,
-	     cli_user(sptr)->acc_create));
+	      "account \"%s\", timestamp %Tu", account,
+	      cli_user(sptr)->acc_create));
       }
       ircd_strncpy(cli_user(sptr)->account, account, len);
   }
Index: ircd-ircdev/tools/iauth-test
diff -u ircd-ircdev/tools/iauth-test:1.1 ircd-ircdev/tools/iauth-test:1.2
--- ircd-ircdev/tools/iauth-test:1.1	Thu Sep 20 14:00:54 2007
+++ ircd-ircdev/tools/iauth-test	Sat Jan 19 05:28:54 2008
@@ -162,13 +162,15 @@
                 '127.0.0.33' => { T_reply => 'R account-3' },
                 '127.0.0.34' => { T_reply => 'k' },
                 '127.0.0.35' => { T_reply => 'K' },
-                # 127.0.1.x: io/iU/iu functionality.
+                # 127.0.1.x: io/iU/iu/iM functionality.
                 '127.0.1.0'  => { C_reply => 'o forced',
                                   H_reply => 'D' },
                 '127.0.1.1'  => { C_reply => 'U trusted',
                                   H_reply => 'D' },
                 '127.0.1.2'  => { C_reply => 'u untrusted',
                                   H_reply => 'D' },
+                '127.0.1.3'  => { C_reply => 'M +i',
+                                  H_reply => 'D' },
                 # 127.0.2.x: iI/iN functionality.
                 '127.0.2.0'  => { C_reply => 'N iauth.assigned.host',
                                   H_reply => 'D' },
----------------------- End of diff -----------------------