[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Mon Oct 25 09:56:49 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-10-25 15:56:48 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     NEWS README THANKS eggdrop.conf doc/BUG-REPORT doc/COMPILE-GUIDE
     doc/Changes1.8 doc/PATCH-HOWTO doc/tcl-commands.doc
     doc/html/egg-core.html doc/html/tcl-commands.html
     doc/settings/core.settings doc/settings/mod.channels
     doc/settings/mod.server help/set/cmds1.help src/chanprog.c
     src/tcl.c src/mod/irc.mod/msgcmds.c

Log message:

Performed some cleanup. Removed some obsolete config aliases.
Added missing parts of the documentation. Updated news and features for 1.8.

---------------------- diff included ----------------------
Index: eggdrop1.8/NEWS
diff -u eggdrop1.8/NEWS:1.2 eggdrop1.8/NEWS:1.3
--- eggdrop1.8/NEWS:1.2	Tue Jul 27 15:49:41 2010
+++ eggdrop1.8/NEWS	Mon Oct 25 09:56:35 2010
@@ -1,7 +1,7 @@
-$Id: NEWS,v 1.2 2010/07/27 21:49:41 pseudo Exp $
+$Id: NEWS,v 1.3 2010/10/25 15:56:35 pseudo Exp $
 
 News
-Last revised: April 16, 2003
+Last revised: October 25, 2010
      _________________________________________________________________
 
                                    News
@@ -11,8 +11,9 @@
 
     INSTALL
     README
-    doc/BOTNET
-    doc/Changes1.6
+    doc/TLS
+    doc/IPV6
+    doc/Changes1.8
     doc/tcl-commands.doc
 
   All of these documents combined will fill you in on the latest changes to
@@ -32,6 +33,38 @@
      _________________________________________________________________
 
 Changes made to Eggdrop 1.8.x from Eggdrop1.6.x:
+
+  IPV6
+
+    Full IPv6 support for servers, telnet and script connections, dcc and
+    botnet. See doc/IPV6 for more information.
+
+
+  SSL
+
+    Full SSL support has been added for all kinds of connections, including
+    certificate verification and authorization. See doc/TLS.
+
+
+  WIRE REMOVED
+
+    The wire module has been removed from eggdrop 1.8. You can still get it
+    from ftp://eggheads.org/pub/eggdrop/modules/1.8/wire-2.1.tar.gz
+    Note that with ssl support you can have encrypted botnet and partyline
+    without wire.mod.
+
+
+  DOCUMENTATION
+
+    Documentation has been updated to reflect new and removed commands and
+    variables. Almost all files have changed, so take a look at them.
+
+
+  TCL COMMANDS
+
+    A lot of changes have been made to Tcl commands. Please look at
+    doc/tcl-commands.doc to see them. New or changed commands are marked with
+    vertical bars (|) on the left.
   ________________________________________________________________________
 
 Copyright (C) 1997 Robey Pointer
Index: eggdrop1.8/README
diff -u eggdrop1.8/README:1.3 eggdrop1.8/README:1.4
--- eggdrop1.8/README:1.3	Thu Aug  5 12:12:04 2010
+++ eggdrop1.8/README	Mon Oct 25 09:56:36 2010
@@ -1,7 +1,7 @@
-$Id: README,v 1.3 2010/08/05 18:12:04 pseudo Exp $
+$Id: README,v 1.4 2010/10/25 15:56:36 pseudo Exp $
 
 Readme
-Last revised: June 5, 2002
+Last revised: October 25, 2010
      _________________________________________________________________
 
                                    Readme
Index: eggdrop1.8/THANKS
diff -u eggdrop1.8/THANKS:1.5 eggdrop1.8/THANKS:1.6
--- eggdrop1.8/THANKS:1.5	Thu Oct 14 03:49:47 2010
+++ eggdrop1.8/THANKS	Mon Oct 25 09:56:36 2010
@@ -1,7 +1,7 @@
-$Id: THANKS,v 1.5 2010/10/14 09:49:47 pseudo Exp $:
+$Id: THANKS,v 1.6 2010/10/25 15:56:36 pseudo Exp $:
 
 Eggdrop Developers and Contributors
-Last revised: June 16, 2010
+Last revised: October 25, 2010
 
 ------------------------------------------------------------------------------
 
Index: eggdrop1.8/doc/BUG-REPORT
diff -u eggdrop1.8/doc/BUG-REPORT:1.2 eggdrop1.8/doc/BUG-REPORT:1.3
--- eggdrop1.8/doc/BUG-REPORT:1.2	Tue Jul 27 15:49:41 2010
+++ eggdrop1.8/doc/BUG-REPORT	Mon Oct 25 09:56:38 2010
@@ -1,5 +1,5 @@
 =====================================================================
-              Eggheads Eggdrop 1.6 Bug Report Form
+              Eggheads Eggdrop 1.8 Bug Report Form
 =====================================================================
 
 By reporting bugs, you help to improve the quality of Eggdrop which
Index: eggdrop1.8/doc/COMPILE-GUIDE
diff -u eggdrop1.8/doc/COMPILE-GUIDE:1.2 eggdrop1.8/doc/COMPILE-GUIDE:1.3
--- eggdrop1.8/doc/COMPILE-GUIDE:1.2	Tue Jul 27 07:05:43 2010
+++ eggdrop1.8/doc/COMPILE-GUIDE	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: COMPILE-GUIDE,v 1.2 2010/07/27 13:05:43 pseudo Exp $
+$Id: COMPILE-GUIDE,v 1.3 2010/10/25 15:56:38 pseudo Exp $
 
 Eggdrop Compile Guide and FAQ
-Last revised: August 20, 2004
+Last revised: October 25, 2010
     _____________________________________________________________________
 
                         Eggdrop Compile Guide and FAQ
@@ -78,6 +78,10 @@
              See 'E. Tcl Detection and Installation' below (at the end of this
              compile guide).
 
+           --with-handlen=
+             Configure the handle length of the bot. Allowed values are
+             numbers from 9 to 32 inclusive.
+
       2. Type either 'make config', or 'make iconfig' to determine which
          modules will be compiled.
 
@@ -241,12 +245,13 @@
            install the Tcl provided by Cygwin's installer. After installing,
            open the Cygwin bash prompt.
 
-        2. Download and install TCL 8.4.1. You can get Tcl for Cygwin at
+        2. Download and install TCL 8.5.9. You can get Tcl for Cygwin at
+           http://prdownloads.sourceforge.net/windrop/tcl-8.5.9.tar.gz.
            http://prdownloads.sourceforge.net/windrop/tcl-8.4.1.tar.gz.
            Extract this to the Cygwin root directory:
 
              cd /
-             tar -zxf tcl-8.4.1.tar.gz
+             tar -zxf tcl-8.5.9.tar.gz
 
         3. Download Eggdrop from geteggdrop.com to your home directory.
            This is usually something like 'C:\cygwin\home\<username>\'. After
@@ -286,18 +291,19 @@
            directory, replacing all '\'s with '/'s.
 
              cp /bin/cygwin1.dll 'C:/eggdrop'
-             cp /usr/local/bin/tcl84.dll 'C:/eggdrop'
+             cp /usr/local/bin/libtcl8.5.dll 'C:/eggdrop'
              cp /usr/local/bin/tclpip84.dll 'C:/eggdrop'
+             cp /bin/cyggcc_s-1.dll 'C:/eggdrop'
+
+             cp /bin/cygcrypto-0.9.8.dll 'C:/eggdrop' (if compiled with ssl)
+             cp /bin/cygssl-0.9.8.dll 'C:/eggdrop' (if compiled with ssl)
 
              mkdir C:/eggdrop/lib
-             cp -r /usr/local/lib/dde1.2 'C:/eggdrop/lib'
-             cp -r /usr/local/lib/reg1.1 'C:/eggdrop/lib'
-             cp -r /usr/local/lib/tcl8.4 'C:/eggdrop/lib'
+             cp -r /usr/local/lib/tcl 'C:/eggdrop/lib'
+             cp -r /usr/local/lib/tcl8.5 'C:/eggdrop/lib'
 
              cp /bin/cygz.dll 'C:/eggdrop' (if you selected compress.mod)
 
-             cp /bin/cygminires.dll 'C:/eggdrop' (if you selected dns.mod)
-
 
     I. Tcl Detection and Installation
         If ./configure does not correctly detect the location of your Tcl
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.26 eggdrop1.8/doc/Changes1.8:1.27
--- eggdrop1.8/doc/Changes1.8:1.26	Sun Oct 24 07:41:53 2010
+++ eggdrop1.8/doc/Changes1.8	Mon Oct 25 09:56:38 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.26 2010/10/24 13:41:53 pseudo Exp $
+$Id: Changes1.8,v 1.27 2010/10/25 15:56:38 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,11 @@
 
 1.8.0 (CVS):
 
+  - Performed some cleanup. Removed some obsolete config aliases.
+  - Added missing parts of the documentation. Updated news and features
+    for 1.8.
+    Patch by: pseudo
+
   - Added -lcrypto when probing for -lssl in --with-ssllib
     Patch by: pseudo
 
Index: eggdrop1.8/doc/PATCH-HOWTO
diff -u eggdrop1.8/doc/PATCH-HOWTO:1.3 eggdrop1.8/doc/PATCH-HOWTO:1.4
--- eggdrop1.8/doc/PATCH-HOWTO:1.3	Tue Jul 27 15:49:41 2010
+++ eggdrop1.8/doc/PATCH-HOWTO	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: PATCH-HOWTO,v 1.3 2010/07/27 21:49:41 pseudo Exp $
+$Id: PATCH-HOWTO,v 1.4 2010/10/25 15:56:38 pseudo Exp $
 
 Patch Howto
-Last revised: July 23, 2004
+Last revised: October 25, 2010
     _____________________________________________________________________
 
                                Patch Howto
@@ -50,7 +50,7 @@
 
       |Index: Makefile.in
       |===================================================================
-      |RCS file: /usr/local/cvsroot/eggdrop1.6/Makefile.in,v
+      |RCS file: /usr/local/cvsroot/eggdrop1.8/Makefile.in,v
       |retrieving revision 1.38
       |diff -u -r1.38 Makefile.in
       |--- Makefile.in	17 Jun 2004 05:43:28 -0000	1.38
Index: eggdrop1.8/doc/html/egg-core.html
diff -u eggdrop1.8/doc/html/egg-core.html:1.5 eggdrop1.8/doc/html/egg-core.html:1.6
--- eggdrop1.8/doc/html/egg-core.html:1.5	Sun Oct 24 07:22:39 2010
+++ eggdrop1.8/doc/html/egg-core.html	Mon Oct 25 09:56:38 2010
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.5 2010/10/24 13:22:39 pseudo Exp $ -->
+<!-- $Id: egg-core.html,v 1.6 2010/10/25 15:56:38 pseudo Exp $ -->
 
 <html>
   <head>
@@ -641,8 +641,9 @@
         <dt><strong>set ident-timeout 5</strong></dt>
 
         <dd>
-          <p>This settings defines a time in seconds that the bot should
-          wait before a dcc chat, telnet, or relay connection times out.</p>
+          <p>This setting defines the time in seconds the bot should wait
+          for ident reply before the lookup fails. The default ident on
+          timeout is &quot;telnet&quot;.</p>
         </dd>
 
         <dt><strong>set require-p 0</strong></dt>
@@ -680,7 +681,7 @@
          <dt><strong>set connect-timeout 15</strong></dt>
 
         <dd>
-          <p>This settings defines a timeout in seconds how long the bot
+          <p>This setting defines a timeout in seconds how long the bot
           should wait for a dcc chat, telnet, relay, etc connection.</p>
         </dd>
 
Index: eggdrop1.8/doc/html/tcl-commands.html
diff -u eggdrop1.8/doc/html/tcl-commands.html:1.6 eggdrop1.8/doc/html/tcl-commands.html:1.7
--- eggdrop1.8/doc/html/tcl-commands.html:1.6	Sat Oct 23 05:16:12 2010
+++ eggdrop1.8/doc/html/tcl-commands.html	Mon Oct 25 09:56:38 2010
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: tcl-commands.html,v 1.6 2010/10/23 11:16:12 pseudo Exp $ -->
+<!-- $Id: tcl-commands.html,v 1.7 2010/10/25 15:56:38 pseudo Exp $ -->
 
 <html>
   <head>
@@ -128,7 +128,7 @@
           <p><strong>Module:</strong> server</p>
         </dd>
 
-        <dt><strong><a name="cmd_putnow"></a>putnow &lt;text&gt; [-oneline]</strong></dt>*
+        <dt><strong><a name="cmd_putnow"></a>putnow &lt;text&gt; [-oneline]</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> sends text to the server
@@ -1171,7 +1171,7 @@
           <p><strong>Module:</strong> core</p>
         </dd>
 
-        <dt><strong><a name="cmd_backup"></a>backup</strong></dt>*
+        <dt><strong><a name="cmd_backup"></a>backup</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> makes a simple backup of the
@@ -1553,7 +1553,7 @@
         </dd>
 
         <dt><strong><a name="cmd_resetchanidle"></a>resetchanidle [nick]
-        &lt;channel&gt;</strong></dt>*
+        &lt;channel&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> resets the channel idle time for
@@ -1566,7 +1566,7 @@
         </dd>
 
         <dt><strong><a name="cmd_resetchanjoin"></a>resetchanjoin [nick]
-        &lt;channel&gt;</strong></dt>*
+        &lt;channel&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> resets the channel join time for
@@ -1579,7 +1579,7 @@
         </dd>
 
         <dt><strong><a name="cmd_resetchan"></a>resetchan &lt;channel&gt;
-	[flags]</strong></dt>*
+	[flags]</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> rereads in the channel info from
@@ -1752,12 +1752,13 @@
           <p><strong>Module:</strong> irc</p>
         </dd>
 
-        <dt><strong><a name="cmd_jump"></a>jump [server [port [password]]]</strong></dt>
+        <dt><strong><a name="cmd_jump"></a>jump [server [[+]port [password]]]</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> jumps to the server specified,
           or (if none is specified) the next server in the bot&#39;s
-          serverlist</p>
+          serverlist. If you prefix the port with (e.g. +6697), a SSL
+          connection will be attempted.</p>
 
           <p><strong>Returns:</strong> nothing</p>
 
@@ -2260,7 +2261,7 @@
           <p><strong>Module:</strong> core</p>
         </dd>
 
-        <dt><strong><a name="cmd_connect"></a>connect &lt;host&gt; &lt;port&gt;</strong></dt>
+        <dt><strong><a name="cmd_connect"></a>connect &lt;host&gt; &lt;[+]port&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> makes an outgoing connection
@@ -3011,7 +3012,7 @@
         </dd>
 
         <dt><strong><a name="cmd_maskhost"></a>maskhost &lt;nick!user at host&gt;
-        [masktype]</strong></dt>*
+        [masktype]</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> masks the given irc hostmask, so
@@ -3651,7 +3652,7 @@
 
 
         <dt><strong><a name="cmd_matchaddr"></a>matchaddr &lt;hostmask&gt;
-        &lt;address&gt;</strong></dt>*
+        &lt;address&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> checks if the address matches the
@@ -3665,7 +3666,7 @@
 
 
         <dt><strong><a name="cmd_matchcidr"></a>matchcidr &lt;block&gt;
-        &lt;address&gt; &lt;prefix&gt;</strong></dt>*
+        &lt;address&gt; &lt;prefix&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> performs a cidr match on the
@@ -3680,7 +3681,7 @@
 
 
         <dt><strong><a name="cmd_matchstr"></a>matchstr &lt;pattern&gt;
-        &lt;string&gt;</strong></dt>*
+        &lt;string&gt;</strong></dt>
 
         <dd>
           <p><strong>Description:</strong> checks if pattern matches string.
@@ -4913,7 +4914,7 @@
             </li>
 
             <li>
-              <p><a name="binda_out"></a><strong>OUT (stackable)</strong></p>*
+              <p><a name="binda_out"></a><strong>OUT (stackable)</strong></p>
 
               <p><strong>bind out &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
               proc-name &lt;queue&gt; &lt;text&gt; &lt;queued|sent&gt;
@@ -4932,7 +4933,7 @@
             </li>
 
             <li>
-              <p><a name="binda_cron"></a><strong>CRON (stackable)</strong></p>*
+              <p><a name="binda_cron"></a><strong>CRON (stackable)</strong></p>
 
               <p><strong>bind cron &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
               proc-name &lt;minute&gt; &lt;hour&gt; &lt;day&gt; &lt;month&gt;
@@ -4955,7 +4956,7 @@
             </li>
 
             <li>
-              <p><a name="binda_log"></a><strong>LOG (stackable)</strong></p>*
+              <p><a name="binda_log"></a><strong>LOG (stackable)</strong></p>
 
               <p><strong>bind log &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
               proc-name &lt;level&gt; &lt;channel&gt; &lt;message&gt;</strong>
@@ -4970,6 +4971,36 @@
 
               <p><strong>Module:</strong> core</p>
             </li>
+
+            <li>
+              <p><a name="binda_tls"></a><strong>TLS (stackable)</strong></p>*
+
+              <p><strong>bind die &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
+              proc-name &lt;idx&gt</strong>
+              </p>
+
+              <p><strong>Description:</strong> triggered for tcp connections
+              when a ssl handshake has completed and the connection is
+              secured. The mask is matched against the idx of the connection.
+              </p>
+
+              <p><strong>Module:</strong> core</p>
+            </li>
+
+            <li>
+              <p><a name="binda_die"></a><strong>DIE (stackable)</strong></p>*
+
+              <p><strong>bind die &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
+              proc-name &lt;shutdownreason&gt</strong>
+              </p>
+
+              <p><strong>Description:</strong> triggered when eggdrop is
+              about to die. The mask is matched against the shutdown reason.
+              The bind won't be triggered if the bot crashes or is being
+              terminated by SIGKILL.</p>
+
+              <p><strong>Module:</strong> core</p>
+            </li>
           </ol>
         </li>
 
@@ -5121,11 +5152,18 @@
             </li>
 
             <li>
-              <p><a name="bindb_evnt"></a><strong>EVNT</strong></p>
+              <p><a name="bindb_evnt"></a><strong>EVNT</strong></p>*
             
               <p>Return 1 to make Eggdrop not to take the default action for
               the event. Used for signal type events, ignored for others.</p>
             </li>
+            
+            <li>
+              <p><a name="bindb_tls"></a><strong>TLS</strong></p>*
+            
+              <p>Return 1 to disable verbose ssl information for the
+              handshake.</p>
+            </li>
           </ol>
         </li>
       </ol>
@@ -5177,9 +5215,11 @@
       <p>To initiate an outgoing connection, use:</p>
 
       <blockquote>
-        <p>set idx [connect &lt;hostname&gt; &lt;port&gt;]</p>
+        <p>set idx [connect &lt;hostname&gt; &lt;[+]port&gt;]</p>
       </blockquote>
 
+      <p>For SSL connections, prefix the port with a plus sign.</p>
+
       <p>$idx now contains a new DCC entry for the outgoing connection.</p>
 
       <p>All connections use non-blocking (commonly called
@@ -5216,9 +5256,11 @@
       <p>To create a listen port, use:</p>
 
       <blockquote>
-        <p>listen &lt;port&gt; script &lt;proc&gt;</p>
+        <p>listen &lt;[+]port&gt; script &lt;proc&gt;</p>
       </blockquote>
 
+      <p>To listen for SSL connections, prefix the port with a plus sign.</p>
+
       <p>Procs should be declared as:</p>
 
       <blockquote>
@@ -5240,6 +5282,12 @@
       The proc immediately puts this idx under control. Once
       &#39;listen:grab&#39; has been called, the idx behaves exactly like
       an outgoing connection would.</p>
+      
+      <p>Secure connection can be also established after a connection is
+      active. You can connect/listen normally and switch later using the
+      &quot;starttls&quot; command. Your script should first inform the other
+      side of the connection that it wants to switch to SSL. How to do this
+      is application specific.</p>
 
       <p>The best way to learn how to use these commands is to find a
       script that uses them and follow it carefully. However, hopefully
Index: eggdrop1.8/doc/settings/core.settings
diff -u eggdrop1.8/doc/settings/core.settings:1.5 eggdrop1.8/doc/settings/core.settings:1.6
--- eggdrop1.8/doc/settings/core.settings:1.5	Sun Oct 24 07:22:40 2010
+++ eggdrop1.8/doc/settings/core.settings	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: core.settings,v 1.5 2010/10/24 13:22:40 pseudo Exp $
+$Id: core.settings,v 1.6 2010/10/25 15:56:38 pseudo Exp $
 
 Eggdrop Core Settings
-Last revised: April 17, 2003
+Last revised: October 25, 2010
     _____________________________________________________________________
 
                             Eggdrop Core Settings
@@ -363,8 +363,8 @@
 
 
     set ident-timeout 5
-      This settings defines a time in seconds that the bot should wait before
-      a dcc chat, telnet, or relay connection times out.
+      This setting defines the time in seconds the bot should wait for ident reply
+      before the lookup fails. The default ident on timeout is 'telnet'.
 
 
     set require-p 0
@@ -390,7 +390,7 @@
 
 
     set connect-timeout 15
-      This settings defines a time in seconds that the bot should wait before
+      This setting defines a time in seconds that the bot should wait before
       a dcc chat, telnet, or relay connection times out.
 
 
Index: eggdrop1.8/doc/settings/mod.channels
diff -u eggdrop1.8/doc/settings/mod.channels:1.1.1.1 eggdrop1.8/doc/settings/mod.channels:1.2
--- eggdrop1.8/doc/settings/mod.channels:1.1.1.1	Mon Jul 26 15:11:06 2010
+++ eggdrop1.8/doc/settings/mod.channels	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: mod.channels,v 1.1.1.1 2010/07/26 21:11:06 simple Exp $
+$Id: mod.channels,v 1.2 2010/10/25 15:56:38 pseudo Exp $
 
 Channels Module
-Last revised: February 12, 2003
+Last revised: October 25, 2010
     _____________________________________________________________________
 
                                Channels Module
Index: eggdrop1.8/doc/settings/mod.server
diff -u eggdrop1.8/doc/settings/mod.server:1.3 eggdrop1.8/doc/settings/mod.server:1.4
--- eggdrop1.8/doc/settings/mod.server:1.3	Sun Oct 24 07:22:40 2010
+++ eggdrop1.8/doc/settings/mod.server	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: mod.server,v 1.3 2010/10/24 13:22:40 pseudo Exp $
+$Id: mod.server,v 1.4 2010/10/25 15:56:38 pseudo Exp $
 
 Server Module
-Last revised: February 12, 2003
+Last revised: October 25, 2010
     _____________________________________________________________________
 
                                 Server Module
Index: eggdrop1.8/doc/tcl-commands.doc
diff -u eggdrop1.8/doc/tcl-commands.doc:1.5 eggdrop1.8/doc/tcl-commands.doc:1.6
--- eggdrop1.8/doc/tcl-commands.doc:1.5	Sat Oct 23 05:16:12 2010
+++ eggdrop1.8/doc/tcl-commands.doc	Mon Oct 25 09:56:38 2010
@@ -1,7 +1,7 @@
-$Id: tcl-commands.doc,v 1.5 2010/10/23 11:16:12 pseudo Exp $
+$Id: tcl-commands.doc,v 1.6 2010/10/25 15:56:38 pseudo Exp $
 
 Eggdrop Tcl Commands
-Last revised: October 22, 2010
+Last revised: October 24, 2010
     _____________________________________________________________________
 
                            Eggdrop Tcl Commands
@@ -50,13 +50,13 @@
     Returns: nothing
     Module: server
 
-| putnow <text> [-oneline]
-|   Description: sends text to the server immediately, bypassing all queues.
-|     Use with caution, as the bot may easily flood itself off the server.
-|   Options:
-|     -oneline: send text up to the first \r or \n, discarding the rest
-|   Returns: nothing
-|   Module: server
+  putnow <text> [-oneline]
+    Description: sends text to the server immediately, bypassing all queues.
+      Use with caution, as the bot may easily flood itself off the server.
+    Options:
+      -oneline: send text up to the first \r or \n, discarding the rest
+    Returns: nothing
+    Module: server
 
   putkick <channel> <nick,nick,...> [reason]
     Description: sends kicks to the server and tries to put as many nicks
@@ -736,30 +736,30 @@
     Returns: nothing
     Module: irc
 
-| resetchanidle [nick] <channel>
-|   Description: resets the channel idle time for the given nick or for all
-|     nicks on the channel if no nick is specified.
-|   Returns: nothing
-|   Module: irc
-
-| resetchanjoin [nick] <channel>
-|   Description: resets the channel join time for the given nick or for all
-|     nicks on the channel if no nick is specified.
-|   Returns: nothing
-|   Module: irc
-
-| resetchan <channel> [flags]
-|   Description: rereads in the channel info from the server. If flags are
-|     specified, only the required information will be reset, according to
-|     the given flags. Available flags:
-|       b - reset channel bans
-|       e - reset channel exempts
-|       I - reset channel invites
-|       m - refresh channel modes 
-|       t - refresh channel topic
-|       w - refresh memberlist
-|   Returns: nothing
-|   Module: irc
+  resetchanidle [nick] <channel>
+    Description: resets the channel idle time for the given nick or for all
+      nicks on the channel if no nick is specified.
+    Returns: nothing
+    Module: irc
+
+  resetchanjoin [nick] <channel>
+    Description: resets the channel join time for the given nick or for all
+      nicks on the channel if no nick is specified.
+    Returns: nothing
+    Module: irc
+
+  resetchan <channel> [flags]
+    Description: rereads in the channel info from the server. If flags are
+      specified, only the required information will be reset, according to
+      the given flags. Available flags:
+        b - reset channel bans
+        e - reset channel exempts
+        I - reset channel invites
+        m - refresh channel modes 
+        t - refresh channel topic
+        w - refresh memberlist
+    Returns: nothing
+    Module: irc
 
   getchanhost <nickname> [channel]
     Returns: user at host of the specified nickname (the nickname is not included
@@ -1345,26 +1345,26 @@
       list of logfiles such as: {mco * eggdrop.log} {jp #lame lame.log}
     Module: core
 
-| maskhost <nick!user at host> [masktype]
-|   Returns: masked hostmask for the string given according to the masktype
-|     (the default is 3).
-|     Available types are:
-|       0: *!user at host
-|       1: *!*user at host
-|       2: *!*@host
-|       3: *!*user@*.host
-|       4: *!*@*.host
-|       5: nick!user at host
-|       6: nick!*user at host
-|       7: nick!*@host
-|       8: nick!*user@*.host
-|       9: nick!*@*.host
-|     You can also specify types from 10 to 19 which correspond to types
-|     0 to 9, but instead of using a * wildcard to replace portions of the
-|     host, only numbers in hostnames are replaced with the '?' wildcard.
-|     Same is valid for types 20-29, but instead of '?', the '*' wildcard
-|     will be used.
-|   Module: core
+  maskhost <nick!user at host> [masktype]
+    Returns: masked hostmask for the string given according to the masktype
+      (the default is 3).
+      Available types are:
+        0: *!user at host
+        1: *!*user at host
+        2: *!*@host
+        3: *!*user@*.host
+        4: *!*@*.host
+        5: nick!user at host
+        6: nick!*user at host
+        7: nick!*@host
+        8: nick!*user@*.host
+        9: nick!*@*.host
+      You can also specify types from 10 to 19 which correspond to types
+      0 to 9, but instead of using a * wildcard to replace portions of the
+      host, only numbers in hostnames are replaced with the '?' wildcard.
+      Same is valid for types 20-29, but instead of '?', the '*' wildcard
+      will be used.
+    Module: core
 
   timer <minutes> <tcl-command>
     Description: executes the given Tcl command after a certain number of
@@ -1516,7 +1516,7 @@
     Returns: nothing
     Module: core
 
- traffic
+  traffic
     Returns: a list of sublists containing information about the bot's
       traffic usage in bytes. Each sublist contains five elements: type,
       in-traffic today, in-traffic total, out-traffic today, out-traffic
@@ -1580,38 +1580,37 @@
     Returns: the stripped string.
     Module: core
 
-| matchaddr <hostmask> <address>
-|   Description: checks if the address matches the hostmask given. The
-|     address should be in the form nick!user at host.
-|   Returns: 1 if the address matches the hostmask, 0 otherwise.
-|   Module: core
-
-|  matchcidr <block> <address> <prefix>
-|   Description: performs a cidr match on the specified ip addresses.
-|     IPv6 is supported, if enabled at compile time.
-|       Example: matchcidr 192.168.0.0 192.168.1.17 16
-|   Returns: 1 if the address matches the block prefix, 0 otherwise.
+  matchaddr <hostmask> <address>
+    Description: checks if the address matches the hostmask given. The
+      address should be in the form nick!user at host.
+    Returns: 1 if the address matches the hostmask, 0 otherwise.
+    Module: core
+
+  matchcidr <block> <address> <prefix>
+    Description: performs a cidr match on the specified ip addresses.
+      IPv6 is supported, if enabled at compile time.
+        Example: matchcidr 192.168.0.0 192.168.1.17 16
+    Returns: 1 if the address matches the block prefix, 0 otherwise.
+    Module: core
+
+  matchstr <pattern> <string>
+    Description: checks if pattern matches string. Only two wildcards are
+      supported: '*' and '?'. Matching is case-insensitive. This command
+      is intended as a simplified alternative to Tcl's string match.  
+    Returns: 1 if the pattern matches the string, 0 if it doesn't.
+    Module: core
+
+| status [type]
+|   Description: provides eggdrop status information similar to the .status
+|     command in partyline. The available types of information are:
+|       cpu   - total cpu time spent by eggdrop
+|       mem   - dynamically allocated memory excluding the Tcl interpreter
+|       cache - user entries cache hits (in %)
+|       ipv6  - shows whether IPv6 support was compiled in
+|   Returns: the requested information type or all information if type
+|     isn't specified. The format is a flat list of name-value pairs.
 |   Module: core
 
-|  matchstr <pattern> <string>
-|   Description: checks if pattern matches string. Only two wildcards are
-|     supported: '*' and '?'. Matching is case-insensitive. This command
-|     is intended as a simplified alternative to Tcl's string match.  
-|   Returns: 1 if the pattern matches the string, 0 if it doesn't.
-|   Module: core
-
-|  status [type]
-|    Description: provides eggdrop status information similar to the .status
-|      command in partyline. The available types of information are:
-|        cpu   - total cpu time spent by eggdrop
-|        mem   - dynamically allocated memory excluding the Tcl interpreter
-|        cache - user entries cache hits (in %)
-|        ipv6  - shows whether IPv6 support was compiled in
-|    Returns: the requested information type or all information if type
-|      isn't specified. The format is a flat list of name-value pairs.
-|    Module: core
-
-
 | istls <idx>
 |  Description: checks if a connection is encrypted or cleartext. This
 |    command is available on TLS-enabled bots only.
@@ -1764,11 +1763,11 @@
 
          Description: matches the entire line of text from a /msg with the
            mask. This is useful for binding Tcl procs to words or phrases
-|          spoken anywhere within a line of text. If the proc returns 1,
-|          Eggdrop will not log the message that triggered this bind.
-|          MSGM binds are processed before MSG binds. If the exclusive-binds
-|          setting is enabled, MSG binds will not be triggered by text that
-|          a MSGM bind has already handled.
+           spoken anywhere within a line of text. If the proc returns 1,
+           Eggdrop will not log the message that triggered this bind.
+           MSGM binds are processed before MSG binds. If the exclusive-binds
+           setting is enabled, MSG binds will not be triggered by text that
+           a MSGM bind has already handled.
          Module: server
 
     (6)  PUBM (stackable)
@@ -1778,11 +1777,11 @@
          Description: just like MSGM, except it's triggered by things said
            on a channel instead of things /msg'd to the bot. The mask is
            matched against the channel name followed by the text and can
-|          contain wildcards. If the proc returns 1, Eggdrop will not log
-|          the message that triggered this bind. PUBM binds are processed
-|          before PUB binds. If the exclusive-binds setting is enabled,
-|          PUB binds will not be triggered by text that a PUBM bind has
-|          already handled.
+           contain wildcards. If the proc returns 1, Eggdrop will not log
+           the message that triggered this bind. PUBM binds are processed
+           before PUB binds. If the exclusive-binds setting is enabled,
+           PUB binds will not be triggered by text that a PUBM bind has
+           already handled.
          Module: irc
 
     (7)  NOTC (stackable)
@@ -1794,8 +1793,8 @@
            notice and can contain wildcards. It is considered a breach of
            protocol to respond to a /notice on IRC, so this is intended for
            internal use (logging, etc.) only. Note that server notices do
-|          not trigger the NOTC bind. If the proc returns 1, Eggdrop will
-|          not log the message that triggered this bind.
+           not trigger the NOTC bind. If the proc returns 1, Eggdrop will
+           not log the message that triggered this bind.
 
            New Tcl procs should be declared as
              proc notcproc {nick uhost hand text {dest ""}} {
@@ -2087,16 +2086,16 @@
            "*" for the bind); flags are ignored.
          Module: server
 
-|   (31) NOTE (stackable)
-|        bind note <flags> <mask> <proc>
-|        procname <from> <to> <text>
-|
-|        Description: incoming notes (either from the party line, someone on
-|          IRC, or someone on another bot on the botnet) are checked against
-|          these binds before being processed. The mask is matched against
-|          the receiving handle and supports wildcards. If the proc returns 1,
-|          Eggdrop will not process the note any further. Flags are ignored.
-|        Module: core
+    (31) NOTE (stackable)
+         bind note <flags> <mask> <proc>
+         procname <from> <to> <text>
+
+         Description: incoming notes (either from the party line, someone on
+           IRC, or someone on another bot on the botnet) are checked against
+           these binds before being processed. The mask is matched against
+           the receiving handle and supports wildcards. If the proc returns 1,
+           Eggdrop will not process the note any further. Flags are ignored.
+         Module: core
 
     (32) ACT (stackable)
          bind act <flags> <mask> <proc>
@@ -2107,18 +2106,18 @@
            text of the action and can support wildcards.
          Module: core
 
-   (33) WALL (stackable)
-        bind wall <flags> <mask> <proc>
-        proc-name <from> <msg>
-
-        Description: when the bot receives a wallops, it invokes this
-          binding. flags are ignored; the mask is matched against the text
-          of the wallops msg. Note that RFC shows the server name as a source
-          of the message, whereas many IRCds send the nick!user at host of the
-          actual sender, thus, Eggdrop will not parse it at all, but simply
-|         pass it to bind in its original form. If the proc returns 1,
-|         Eggdrop will not log the message that triggered this bind.
-        Module: server
+    (33) WALL (stackable)
+         bind wall <flags> <mask> <proc>
+         proc-name <from> <msg>
+
+         Description: when the bot receives a wallops, it invokes this
+           binding. flags are ignored; the mask is matched against the text
+           of the wallops msg. Note that RFC shows the server name as a source
+           of the message, whereas many IRCds send the nick!user at host of the
+           actual sender, thus, Eggdrop will not parse it at all, but simply
+           pass it to bind in its original form. If the proc returns 1,
+           Eggdrop will not log the message that triggered this bind.
+         Module: server
 
     (34) BCST (stackable)
          bind bcst <flags> <mask> <proc>
@@ -2244,49 +2243,58 @@
            because the data transfer stalled for some reason.
          Module: transfer
 
-|   (45) OUT (stackable)
-|        bind out <flags> <mask> <proc>
-|        proc-name <queue> <message> <queued|sent>
-|
-|        Description: triggered whenever output is sent to the server. Normally
-|          the event will occur twice for each line sent: once before entering
-|          a server queue and once after the message is actually sent. This
-|          allows for more flexible logging of server output and introduces
-|          the ability to cancel the message.
-|          Mask is matched against "queue status", where status is either
-|          'queued' or 'sent'. Queues are: mode, server, help, noqueue.
-|          noqueue is only used by the putnow tcl command.
-|        Module: server
-
-|   (46) CRON (stackable)
-|        bind cron <flags> <mask> <proc>
-|        proc-name <minute> <hour> <day> <month> <weekday>
-|
-|        Description: similar to bind TIME, but the mask is evaluated as a cron
-|          expression, e.g. "16/2 */2 5-15 7,8,9 4". It can contain up to five
-|          fields: minute, hour, day, month, weekday; delimited by whitespace.
-|          Week days are represented as 0-6, where Sunday can be either 0 or 7.
-|          Symbolic names are not supported. The bind will be triggered if the
-|          mask matches all of the fields, except that if both day and weekday
-|          are not '*', only one of them is required to match. If any number of
-|          fields are omitted at the end, the match will proceed as if they were
-|          '*'. All cron operators are supported. Please refer to the crontab
-|          manual for their meanings. Flags are ignored.
-|        Module: core
+   (45) OUT (stackable)
+        bind out <flags> <mask> <proc>
+        proc-name <queue> <message> <queued|sent>
+
+        Description: triggered whenever output is sent to the server. Normally
+          the event will occur twice for each line sent: once before entering
+          a server queue and once after the message is actually sent. This
+          allows for more flexible logging of server output and introduces
+          the ability to cancel the message.
+          Mask is matched against "queue status", where status is either
+          'queued' or 'sent'. Queues are: mode, server, help, noqueue.
+          noqueue is only used by the putnow tcl command.
+        Module: server
 
-|   (47) LOG (stackable)
-|        bind log <flags> <mask> <proc>
-|        proc-name <level> <channel> <message>
+   (46) CRON (stackable)
+        bind cron <flags> <mask> <proc>
+        proc-name <minute> <hour> <day> <month> <weekday>
+
+        Description: similar to bind TIME, but the mask is evaluated as a cron
+          expression, e.g. "16/2 */2 5-15 7,8,9 4". It can contain up to five
+          fields: minute, hour, day, month, weekday; delimited by whitespace.
+          Week days are represented as 0-6, where Sunday can be either 0 or 7.
+          Symbolic names are not supported. The bind will be triggered if the
+          mask matches all of the fields, except that if both day and weekday
+          are not '*', only one of them is required to match. If any number of
+          fields are omitted at the end, the match will proceed as if they were
+          '*'. All cron operators are supported. Please refer to the crontab
+          manual for their meanings. Flags are ignored.
+        Module: core
+
+   (47) LOG (stackable)
+        bind log <flags> <mask> <proc>
+        proc-name <level> <channel> <message>
+
+        Description: triggered whenever a message is sent to a log. The mask is
+          matched against "channel text".
+          The level argument to the proc will contain the level(s) the message
+          is sent to, or '*' if the message is sent to all log levels at once.
+          If the message wasn't sent to a specific channel, channel will be set
+          to '*'.
+        Module: core
+
+|   (48) TLS (stackable)
+|        bind tls <flags> <mask> <proc>
+|        proc-name <idx>
 |
-|        Description: triggered whenever a message is sent to a log. The mask is
-|          matched against "channel text".
-|          The level argument to the proc will contain the level(s) the message
-|          is sent to, or '*' if the message is sent to all log levels at once.
-|          If the message wasn't sent to a specific channel, channel will be set
-|          to '*'.
+|        Description: triggered for tcp connections when a ssl handshake has
+|          completed and the connection is secured. The mask is matched against
+|          the idx of the connection.
 |        Module: core
 
-|   (48) DIE (stackable)
+|   (49) DIE (stackable)
 |        bind die <flags> <mask> <proc>
 |        proc-name <shutdownreason>
 |
@@ -2339,29 +2347,31 @@
 
     (10) CHOF  Return 1 to ask the bot not to process the partyline part event.
 
-|   (11) WALL  Return 1 to make Eggdrop not log the message that triggered
-|              this bind.
+    (11) WALL  Return 1 to make Eggdrop not log the message that triggered
+               this bind.
 
-|   (12) NOTE  Return 1 to make Eggdrop not process the note any further.
-|              This includes stacked note bindings that would be processed
-|              after this one, as well as the built-in eggdrop note handling
-|              routines.
+    (12) NOTE  Return 1 to make Eggdrop not process the note any further.
+               This includes stacked note bindings that would be processed
+               after this one, as well as the built-in eggdrop note handling
+               routines.
 
-|   (13) MSGM  Return 1 to make Eggdrop not log the message that triggered
-|              this bind.
+    (13) MSGM  Return 1 to make Eggdrop not log the message that triggered
+               this bind.
 
-|   (14) PUBM  Return 1 to make Eggdrop not log the message that triggered
-|              this bind.
+    (14) PUBM  Return 1 to make Eggdrop not log the message that triggered
+               this bind.
 
-|   (15) NOTC  Return 1 to make Eggdrop not log the message that triggered
-|              this bind.
+    (15) NOTC  Return 1 to make Eggdrop not log the message that triggered
+               this bind.
 
-|   (16) OUT   Return 1 to make Eggdrop drop the message instead of sending
-|              it. Only meaningful for messages with status "queued".
+    (16) OUT   Return 1 to make Eggdrop drop the message instead of sending
+               it. Only meaningful for messages with status "queued".
 
 |   (17) EVNT  Return 1 to make Eggdrop not to take the default action for
 |              the event. Used for signal type events, ignored for others.
 
+|   (18) TLS   Return 1 to disable verbose ssl information for the handshake.
+
 *** CONTROL PROCEDURES ***
 
   Using the 'control' command, you can put a DCC connection (or outgoing
@@ -2400,7 +2410,9 @@
   more input is a no-no.
 
   To initiate an outgoing connection, use:
-    set idx [connect <hostname> <port>]
+    set idx [connect <hostname> <[+]port>]
+  
+  For SSL connections, prefix the port with a plus sign.
 
   $idx now contains a new DCC entry for the outgoing connection.
 
@@ -2427,7 +2439,9 @@
   it on a closed socket.
 
   To create a listen port, use:
-    listen <port> script <proc>
+    listen <[+]port> script <proc>
+
+  To listen for SSL connections, prefix the port with a plus sign.
 
   Procs should be declared as:
     <procname> <newidx>
@@ -2444,6 +2458,11 @@
     immediately puts this idx under control. Once 'listen:grab' has been
     called, the idx behaves exactly like an outgoing connection would.
 
+  Secure connection can be also established after a connection is active.
+  You can connect/listen normally and switch later using the 'starttls'
+  command. Your script should first inform the other side of the connection
+  that it wants to switch to SSL. How to do this is application specific.
+
   The best way to learn how to use these commands is to find a script that
   uses them and follow it carefully. However, hopefully this has given you
   a good start.
Index: eggdrop1.8/eggdrop.conf
diff -u eggdrop1.8/eggdrop.conf:1.8 eggdrop1.8/eggdrop.conf:1.9
--- eggdrop1.8/eggdrop.conf:1.8	Sun Oct 24 07:22:39 2010
+++ eggdrop1.8/eggdrop.conf	Mon Oct 25 09:56:36 2010
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.8 2010/10/24 13:22:39 pseudo Exp $
+# $Id: eggdrop.conf,v 1.9 2010/10/25 15:56:36 pseudo Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -301,8 +301,8 @@
 # anyway.
 set dcc-sanitycheck 0
 
-# This settings defines a time in seconds that the bot should wait before
-# a dcc chat, telnet, or relay connection times out.
+# This setting defines the time in seconds the bot should wait for ident reply
+# before the lookup fails. The default ident on timeout is 'telnet'.
 set ident-timeout 5
 
 # Define here whether or not a +o user still needs the +p flag to dcc the bot.
@@ -321,7 +321,7 @@
 # to 1. The telnet banner is set by 'set telnet-banner'.
 set use-telnet-banner 0
 
-# This settings defines a time in seconds that the bot should wait before
+# This setting defines a time in seconds that the bot should wait before
 # a dcc chat, telnet, or relay connection times out.
 set connect-timeout 15
 
Index: eggdrop1.8/help/set/cmds1.help
diff -u eggdrop1.8/help/set/cmds1.help:1.5 eggdrop1.8/help/set/cmds1.help:1.6
--- eggdrop1.8/help/set/cmds1.help:1.5	Sun Oct 24 07:22:40 2010
+++ eggdrop1.8/help/set/cmds1.help	Mon Oct 25 09:56:38 2010
@@ -123,7 +123,7 @@
    default, and describes 03:00 (AM).
 %{help=set connect-timeout}%{+n}
 ###  %bset connect-timeout%b <seconds>
-   This settings defines a time in seconds that the bot should
+   This setting defines a time in seconds that the bot should
    wait before a dcc chat, telnet, or relay connection times out.
 %{help=set resolve-timeout}%{+n}
 ###  %bset resolve-timeout%b <seconds>
@@ -240,8 +240,8 @@
    host.
 %{help=set ident-timeout}%{+n}
 ###  %bset ident-timeout%b <timeout>
-   This settings defines a time in seconds that the bot should wait
-   before a dcc chat, telnet, or relay connection times out.
+   This setting defines the time in seconds the bot should wait for ident
+   reply before the lookup fails. The default ident on timeout is 'telnet'.
 %{help=set share-unlinks}%{+n}
 ###  %bset share-unlinks%b 0/1
    This setting prohibits remote bots from telling your Eggdrop to
Index: eggdrop1.8/src/chanprog.c
diff -u eggdrop1.8/src/chanprog.c:1.4 eggdrop1.8/src/chanprog.c:1.5
--- eggdrop1.8/src/chanprog.c:1.4	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/chanprog.c	Mon Oct 25 09:56:38 2010
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.4 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: chanprog.c,v 1.5 2010/10/25 15:56:38 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -294,7 +294,7 @@
 #ifdef HAVE_UNAME
   struct utsname un;
 
-  if (!uname(&un) < 0) {
+  if (uname(&un) < 0) {
 #endif
     vers_t = " ";
     uni_t  = "*unknown*";
Index: eggdrop1.8/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.2 eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.3
--- eggdrop1.8/src/mod/irc.mod/msgcmds.c:1.2	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/mod/irc.mod/msgcmds.c	Mon Oct 25 09:56:38 2010
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  *
- * $Id: msgcmds.c,v 1.2 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: msgcmds.c,v 1.3 2010/10/25 15:56:38 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -795,7 +795,7 @@
 #ifdef HAVE_UNAME
   struct utsname un;
 
-  if (!uname(&un) < 0) {
+  if (uname(&un) < 0) {
 #endif
     vers_t = " ";
     uni_t  = "*unknown*";
Index: eggdrop1.8/src/tcl.c
diff -u eggdrop1.8/src/tcl.c:1.6 eggdrop1.8/src/tcl.c:1.7
--- eggdrop1.8/src/tcl.c:1.6	Sun Oct 24 07:22:40 2010
+++ eggdrop1.8/src/tcl.c	Mon Oct 25 09:56:38 2010
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.6 2010/10/24 13:22:40 pseudo Exp $
+ * $Id: tcl.c,v 1.7 2010/10/25 15:56:38 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -99,10 +99,6 @@
 int utftot = 0;
 int clientdata_stuff = 0;
 
-/* Compatability for removed settings.*/
-int strict_servernames = 0, enable_simul = 1, use_console_r = 0,
-    debug_output = 0;
-
 /* Prototypes for Tcl */
 Tcl_Interp *Tcl_CreateInterp();
 
@@ -575,10 +571,6 @@
   {"copy-to-tmp",           &copy_to_tmp,          0},
   {"quiet-reject",          &quiet_reject,         0},
   {"cidr-support",          &cidr_support,         0},
-  {"strict-servernames",    &strict_servernames,   0}, /* compat */
-  {"enable-simul",          &enable_simul,         0}, /* compat */
-  {"debug-output",          &debug_output,         0}, /* compat */
-  {"use-console-r",         &use_console_r,        0}, /* compat */
 #ifdef IPV6
   {"prefer-ipv6",           &pref_af,              0},
 #endif
----------------------- End of diff -----------------------


More information about the Changes mailing list