[cvslog] (2005-07-31 17:37:40 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Sun Jul 31 11:37:40 CST 2005


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2005-07-31 17:37:40 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     eggdrop.conf doc/UPDATES1.6 doc/html/egg-core.html
     doc/settings/core.settings help/set/cmds1.help src/patch.h
     src/mod/server.mod/servmsg.c

Log message:

- Corrected nat-ip setting documentation.
* Found by: BarkerJr - Patch by: Wcc

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.615 eggdrop1.6/doc/UPDATES1.6:1.616
--- eggdrop1.6/doc/UPDATES1.6:1.615	Sun Jul 31 02:23:09 2005
+++ eggdrop1.6/doc/UPDATES1.6	Sun Jul 31 12:37:29 2005
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.615 2005/07/31 07:23:09 wcc Exp $
+$Id: UPDATES1.6,v 1.616 2005/07/31 17:37:29 wcc Exp $
 
 Eggdrop Changes (since v1.6.0)
     _____________________________________________________________________
@@ -12,6 +12,9 @@
 
 
   1.6.18:
+    - Corrected nat-ip setting documentation.
+    * Found by: BarkerJr - Patch by: Wcc
+
     - Don't allow realname to be blank or whitespace.
     * Found by: Jesse M - Patch by: BarkerJr / Wcc
 
Index: eggdrop1.6/doc/html/egg-core.html
diff -u eggdrop1.6/doc/html/egg-core.html:1.36 eggdrop1.6/doc/html/egg-core.html:1.37
--- eggdrop1.6/doc/html/egg-core.html:1.36	Mon Jan  3 14:01:43 2005
+++ eggdrop1.6/doc/html/egg-core.html	Sun Jul 31 12:37:29 2005
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.36 2005/01/03 20:01:43 paladin Exp $ -->
+<!-- $Id: egg-core.html,v 1.37 2005/07/31 17:37:29 wcc Exp $ -->
 
 <html>
   <head>
@@ -716,10 +716,11 @@
           following ranges: 192.168.0.0-192.168.255.255,
           172.16.0.0-172.31.255.255, 10.0.0.0-10.255.255.255 and your
           firewall transparently changes your address to a unique address
-          for your box) or you have IP masquerading between you and the rest
-          of the world, and /dcc chat,/ctcp chat or userfile sharing
-          aren&#39;t working, enter your outside IP here. Do not enter
-          anything for my-ip or my-hostname if you use this setting.</p>
+          for your box) or you have IP masquerading between you and the
+          rest of the world, and /dcc chat, /ctcp chat or userfile sharing
+          aren't working, enter your outside IP here. This IP is used for
+          transfers only, and has nothing to do with the my-ip or my-hostname
+          settings. You may still need to set my-ip and/or my-hostname.</p>
         </dd>
 
         <dt><strong>set reserved-portrange 2010:2020</strong></dt>
Index: eggdrop1.6/doc/settings/core.settings
diff -u eggdrop1.6/doc/settings/core.settings:1.31 eggdrop1.6/doc/settings/core.settings:1.32
--- eggdrop1.6/doc/settings/core.settings:1.31	Mon Jan  3 14:01:43 2005
+++ eggdrop1.6/doc/settings/core.settings	Sun Jul 31 12:37:29 2005
@@ -1,4 +1,4 @@
-$Id: core.settings,v 1.31 2005/01/03 20:01:43 paladin Exp $
+$Id: core.settings,v 1.32 2005/07/31 17:37:29 wcc Exp $
 
 Eggdrop Core Settings
 Last revised: April 17, 2003
@@ -399,9 +399,10 @@
       ranges: 192.168.0.0-192.168.255.255, 172.16.0.0-172.31.255.255,
       10.0.0.0-10.255.255.255 and your firewall transparently changes your
       address to a unique address for your box) or you have IP masquerading
-      between you and the rest of the world, and /dcc chat,/ctcp chat or
-      userfile sharing aren't working, enter your outside IP here. Do not
-      enter anything for my-ip or my-hostname if you use this setting.
+      between you and the rest of the world, and /dcc chat, /ctcp chat or
+      userfile sharing aren't working, enter your outside IP here. This IP
+      is used for transfers only, and has nothing to do with the my-ip or
+      my-hostname settings. You may still need to set my-ip and/or my-hostname.
 
 
     set reserved-portrange 2010:2020
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.44 eggdrop1.6/eggdrop.conf:1.45
--- eggdrop1.6/eggdrop.conf:1.44	Sun Jul 31 02:01:51 2005
+++ eggdrop1.6/eggdrop.conf	Sun Jul 31 12:37:29 2005
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.44 2005/07/31 07:01:51 wcc Exp $
+# $Id: eggdrop.conf,v 1.45 2005/07/31 17:37:29 wcc Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -327,8 +327,9 @@
 # 10.0.0.0-10.255.255.255 and your firewall transparently changes your
 # address to a unique address for your box) or you have IP masquerading
 # between you and the rest of the world, and /dcc chat, /ctcp chat or
-# userfile sharing aren't working, enter your outside IP here. Do not
-# enter anything for my-ip or my-hostname if you use this setting.
+# userfile sharing aren't working, enter your outside IP here. This IP
+# is used for transfers only, and has nothing to do with the my-ip or
+# my-hostname settings. You may still need to set my-ip and/or my-hostname.
 #set nat-ip "127.0.0.1"
 
 # If you want all dcc file transfers to use a particular portrange either
Index: eggdrop1.6/help/set/cmds1.help
diff -u eggdrop1.6/help/set/cmds1.help:1.7 eggdrop1.6/help/set/cmds1.help:1.8
--- eggdrop1.6/help/set/cmds1.help:1.7	Wed May 26 20:30:11 2004
+++ eggdrop1.6/help/set/cmds1.help	Sun Jul 31 12:37:29 2005
@@ -43,8 +43,10 @@
    firewall transparently changes your address to a unique address
    for your box) or you have IP masquerading between you and the
    rest of the world, and /dcc chat, /ctcp chat or userfile sharing
-   aren't working, enter your outside IP here. Do not enter anything
-   for my-ip or my-hostname if you use this setting.
+   aren't working, enter your outside IP here. This IP is used for
+   transfers only, and has nothing to do with the my-ip or
+   my-hostname settings. You may still need to set my-ip and/or
+   my-hostname.
 %{help=set dcc-sanitycheck}%{+n}
 ###  %bset dcc-sanitycheck%b <0/1>
    This setting will make the bot ignore DCC chat requests which
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.88 eggdrop1.6/src/mod/server.mod/servmsg.c:1.89
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.88	Sun Jul 31 02:23:10 2005
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Sun Jul 31 12:37:29 2005
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.88 2005/07/31 07:23:10 wcc Exp $
+ * $Id: servmsg.c,v 1.89 2005/07/31 17:37:29 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1304,6 +1304,7 @@
     if (botrealname[0] == 0)
       strcpy(botrealname, "/msg LamestBot hello");
     dprintf(DP_MODE, "USER %s . . :%s\n", botuser, botrealname);
-    /* Wait for async result now */
+
+    /* Wait for async result now. */
   }
 }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1159 eggdrop1.6/src/patch.h:1.1160
--- eggdrop1.6/src/patch.h:1.1159	Sun Jul 31 02:23:10 2005
+++ eggdrop1.6/src/patch.h	Sun Jul 31 12:37:29 2005
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1159 2005/07/31 07:23:10 wcc Exp $
+ * $Id: patch.h,v 1.1160 2005/07/31 17:37:29 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1122793406");            /* current unixtime */
+patch("1122831364");            /* current unixtime */
 /*
  *
  *
  */
-patch("realnamefix");
+patch("nat-ip-docs");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list