[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Dec 9 20:40:03 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-10 02:39:08 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     eggdrop.complete.conf doc/html/egg-core.html
     doc/settings/core.settings help/core.help help/set/cmds2.help
     lib/eggdrop/module.h modules/irc/irc.c src/dcc.c src/modules.c
     src/tcl.c

Log message:

open-telnets is no longer a config setting, learn-users handles both irc and telnet

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/html/egg-core.html
diff -u eggdrop1.7/doc/html/egg-core.html:1.21 eggdrop1.7/doc/html/egg-core.html:1.22
--- eggdrop1.7/doc/html/egg-core.html:1.21	Sun Dec  9 15:46:02 2001
+++ eggdrop1.7/doc/html/egg-core.html	Sun Dec  9 20:38:56 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.21 2001/12/09 21:46:02 guppy Exp $ -->
+<!-- $Id: egg-core.html,v 1.22 2001/12/10 02:38:56 guppy Exp $ -->
 
 <html>
   <head>
@@ -451,16 +451,6 @@
         <dd>
           <p>If you telnet-flood to apply even to +f users, set this setting
           to 1</p>
-
-          <p>Valid settings are 0 and 1.</p>
-        </dd>
-
-        <dt><strong>set open-telnets 0</strong></dt>
-
-        <dd>
-          <p>If you want people allow to telnet in and type &#39;NEW&#39; to
-          become a new user, set this to 1. This is similar to
-          &#39;hello&#39;</p>
 
           <p>Valid settings are 0 and 1.</p>
         </dd>
Index: eggdrop1.7/doc/settings/core.settings
diff -u eggdrop1.7/doc/settings/core.settings:1.17 eggdrop1.7/doc/settings/core.settings:1.18
--- eggdrop1.7/doc/settings/core.settings:1.17	Sun Dec  9 15:46:02 2001
+++ eggdrop1.7/doc/settings/core.settings	Sun Dec  9 20:38:57 2001
@@ -271,12 +271,6 @@
     Valid settings are 0 for OFF and 1 ON.
 
 
-set open-telnets 0
-    If you want people allow to telnet in and type 'NEW' to become a new user,
-    set this to 1. This is similar to 'hello'
-    Valid settings are 0 for OFF and 1 ON.
-
-
 set protect-telnet 0
     This setting will drop telnet connections not matching a known host. It
     greatly improves protection from IRCOPs, but makes it impossible for NOIRC
Index: eggdrop1.7/eggdrop.complete.conf
diff -u eggdrop1.7/eggdrop.complete.conf:1.57 eggdrop1.7/eggdrop.complete.conf:1.58
--- eggdrop1.7/eggdrop.complete.conf:1.57	Sun Dec  9 15:49:40 2001
+++ eggdrop1.7/eggdrop.complete.conf	Sun Dec  9 20:38:56 2001
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- set that to the directory eggdrop is in i.e. "#! /home/lamest/egg/eggdrop"
 #
-# $Id: eggdrop.complete.conf,v 1.57 2001/12/09 21:49:40 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.58 2001/12/10 02:38:56 guppy Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -220,10 +220,6 @@
 # [0/1] users with the +o (global or channel op) flag will still need the +p
 # (party line) flag to join the dcc chat party line?
 set require-p 0
-
-# [0/1] allow people to telnet in, type 'NEW', and become a new user?
-# (If you set this to 1, you must set protect-telnet 0)
-set open-telnets 0
 
 # [0/1] Display 'Nickname.' instead of identifying ourselves when people
 # telnet in. Set to 1 to only display Nickname.
Index: eggdrop1.7/help/core.help
diff -u eggdrop1.7/help/core.help:1.14 eggdrop1.7/help/core.help:1.15
--- eggdrop1.7/help/core.help:1.14	Sun Dec  9 15:46:02 2001
+++ eggdrop1.7/help/core.help	Sun Dec  9 20:38:57 2001
@@ -116,7 +116,6 @@
 reserved-portrange
 require-p
 keep-all-logs
-open-telnets
 firewall
 console
 default-flags
Index: eggdrop1.7/help/set/cmds2.help
diff -u eggdrop1.7/help/set/cmds2.help:1.6 eggdrop1.7/help/set/cmds2.help:1.7
--- eggdrop1.7/help/set/cmds2.help:1.6	Sun Dec  9 15:46:02 2001
+++ eggdrop1.7/help/set/cmds2.help	Sun Dec  9 20:38:57 2001
@@ -63,13 +63,6 @@
    at midnight, the current logfile will be renamed to "(logfile).
    (date)" and a new logfile started.  eventually your directory
    will be full of files like "LameBot.log.14Jul94".
-%{help=set open-telnets}%{+n}
-###  %bset open-telnets%b <0/1>
-   specifies whether to accept new users via a telnet connection.
-   if set to 0, the bot will only accept telnet connections from
-   people who already have user records.  if set to 1, someone can
-   enter "NEW" after telnetting to the bot, and create a new user
-   record.
 %{help=set uptime}%{+n}
 ###  %bset uptime%b
    this read-only variable returns the time the bot started running
@@ -83,8 +76,7 @@
 ###  %bset default-flags%b <flags>
    specifies the flags to give to a user when they first
    introduce themselves to the bot with %b/MSG HELLO%b or via telnet.
-   obviously this has no effect if you have %b'learn-users'%b and
-   %b'open-telnets'%b turned off.
+   obviously this has no effect if you have %b'learn-users'%b turned off.
    for a list of the flags, see %b'whois'%b.
 %{help=set numversion}%{+n}
 ###  %bset numversion%b
Index: eggdrop1.7/lib/eggdrop/module.h
diff -u eggdrop1.7/lib/eggdrop/module.h:1.3 eggdrop1.7/lib/eggdrop/module.h:1.4
--- eggdrop1.7/lib/eggdrop/module.h:1.3	Sun Dec  9 15:38:12 2001
+++ eggdrop1.7/lib/eggdrop/module.h	Sun Dec  9 20:38:57 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.3 2001/12/09 21:38:12 guppy Exp $
+ * $Id: module.h,v 1.4 2001/12/10 02:38:57 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -207,7 +207,7 @@
 /* 112 - 115 */
 #define tempdir ((char *)(global[112]))
 #define natip ((char *)(global[113]))
-/* 114: hostname -- UNUSED (drummer) */
+#define learn_users (*(int *)global[114])
 #define origbotname ((char *)(global[115]))
 /* 116 - 119 */
 #define botuser ((char *)(global[116]))
Index: eggdrop1.7/modules/irc/irc.c
diff -u eggdrop1.7/modules/irc/irc.c:1.3 eggdrop1.7/modules/irc/irc.c:1.4
--- eggdrop1.7/modules/irc/irc.c:1.3	Sat Dec  8 14:03:20 2001
+++ eggdrop1.7/modules/irc/irc.c	Sun Dec  9 20:38:57 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.3 2001/12/08 20:03:20 ite Exp $
+ * $Id: irc.c,v 1.4 2001/12/10 02:38:57 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -56,7 +56,6 @@
 static int bounce_exempts = 0;
 static int bounce_invites = 0;
 static int bounce_modes = 0;
-static int learn_users = 0;
 static int wait_info = 15;
 static int invite_key = 1;
 static int no_chanrec_info = 0;
@@ -762,7 +761,6 @@
 
 static tcl_ints myints[] =
 {
-  {"learn-users",		&learn_users,		0},	/* arthur2 */
   {"wait-split",		&wait_split,		0},
   {"wait-info",			&wait_info,		0},
   {"bounce-bans",		&bounce_bans,		0},
@@ -782,13 +780,13 @@
   {"max-invites",		&max_invites,		0},
   {"max-modes",			&max_modes,		0},
   {"net-type",			&net_type,		0},
-  {"strict-host",		&strict_host,		0},	/* arthur2 */
-  {"ctcp-mode",			&ctcp_mode,		0},	/* arthur2 */
-  {"keep-nick",			&keepnick,		0},	/* guppy */
+  {"strict-host",		&strict_host,		0},
+  {"ctcp-mode",			&ctcp_mode,		0},
+  {"keep-nick",			&keepnick,		0},
   {"prevent-mixing",		&prevent_mixing,	0},
   {"rfc-compliant",		&rfc_compliant,		0},
   {"include-lk",		&include_lk,		0},
-  {NULL,			NULL,			0}	/* arthur2 */
+  {NULL,			NULL,			0}
 };
 
 /* Flush the modes for EVERY channel.
Index: eggdrop1.7/src/dcc.c
diff -u eggdrop1.7/src/dcc.c:1.64 eggdrop1.7/src/dcc.c:1.65
--- eggdrop1.7/src/dcc.c:1.64	Sun Dec  9 19:35:14 2001
+++ eggdrop1.7/src/dcc.c	Sun Dec  9 20:38:57 2001
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.64 2001/12/10 01:35:14 ite Exp $
+ * $Id: dcc.c,v 1.65 2001/12/10 02:38:57 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -52,8 +52,7 @@
 				   (default: current directory)		   */
 int	require_p = 0;		/* Require 'p' access to get on the
 				   party line?				   */
-int	allow_new_telnets = 0;	/* Allow people to introduce themselves
-				   via telnet				   */
+int	learn_users = 0;	/* Allow people to introduce themselves    */
 int	stealth_telnets = 0;	/* Be paranoid? <cybah>			   */
 char	network[41] = "unknown-net"; /* Name of the IRC network you're on  */
 int	password_timeout = 180;	/* Time to wait for a password from a user */
@@ -1296,8 +1295,7 @@
     return;
   }
   dcc[idx].status &= ~(STAT_BOTONLY | STAT_USRONLY);
-  if ((!strcasecmp(buf, "NEW")) &&
-      ((allow_new_telnets) || (make_userfile))) {
+  if (!strcasecmp(buf, "NEW") && (learn_users || make_userfile)) {
     dcc[idx].type = &DCC_TELNET_NEW;
     dcc[idx].timeval = now;
     dprintf(idx, "\n");
@@ -2004,6 +2002,6 @@
     dprintf(i, "\n\n");
     sub_lang(i, _("%B  (%E)\n\nPlease enter your nickname.\n"));
   }
-  if (allow_new_telnets)
+  if (learn_users)
     dprintf(i, "(If you are new, enter 'NEW' here.)\n");
 }
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.87 eggdrop1.7/src/modules.c:1.88
--- eggdrop1.7/src/modules.c:1.87	Sun Dec  9 15:38:12 2001
+++ eggdrop1.7/src/modules.c	Sun Dec  9 20:38:57 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.87 2001/12/09 21:38:12 guppy Exp $
+ * $Id: modules.c,v 1.88 2001/12/10 02:38:57 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -47,7 +47,7 @@
 			 userfile[], ver[], notify_new[], helpdir[],
 			 version[], quit_msg[];
 extern int	 noshare, dcc_total, egg_numver, userfile_perm,
-			 ignore_time,
+			 ignore_time, learn_users,
 			 debug_output, gban_total, make_userfile,
 			 gexempt_total, ginvite_total, default_flags,
 			 require_p, max_dcc, share_greet, password_timeout,
@@ -284,7 +284,7 @@
   /* 112 - 115 */
   (Function) tempdir,		 /* char *				*/
   (Function) natip,		 /* char *				*/
-  (Function) 0,			 /* hostname -- UNUSED! (drummer)	*/
+  (Function) & learn_users,	 /* int *				*/
   (Function) origbotname,	 /* char *				*/
   /* 116 - 119 */
   (Function) botuser,		 /* char *				*/
Index: eggdrop1.7/src/tcl.c
diff -u eggdrop1.7/src/tcl.c:1.58 eggdrop1.7/src/tcl.c:1.59
--- eggdrop1.7/src/tcl.c:1.58	Sun Dec  9 15:46:03 2001
+++ eggdrop1.7/src/tcl.c	Sun Dec  9 20:38:57 2001
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.58 2001/12/09 21:46:03 guppy Exp $
+ * $Id: tcl.c,v 1.59 2001/12/10 02:38:57 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -48,7 +48,7 @@
 extern time_t	online_since;
 extern int	backgrd, flood_telnet_thr, flood_telnet_time;
 extern int	shtime, share_greet, require_p;
-extern int	allow_new_telnets, stealth_telnets;
+extern int	learn_users, stealth_telnets;
 extern int	default_flags, conmask, connect_timeout;
 extern int	firewallport, notify_users_at, flood_thr, ignore_time;
 extern int	reserved_port_min, reserved_port_max;
@@ -334,15 +334,13 @@
   {"dcc-flood-thr",		&dcc_flood_thr,		0},
   {"hourly-updates",		&notify_users_at,	0},
   {"connect-timeout",		&connect_timeout,	0},
-  {"reserved-port",		&reserved_port_min,		0},
-  /* booleans (really just ints) */
+  {"reserved-port",		&reserved_port_min,	0},
   {"require-p",			&require_p,		0},
-  {"open-telnets",		&allow_new_telnets,	0},
+  {"learn-users",		&learn_users,		0},
   {"stealth-telnets",		&stealth_telnets,	0},
   {"uptime",			(int *) &online_since,	2},
   {"console",			&conmask,		0},
   {"default-flags",		&default_flags,		0},
-  /* moved from eggdrop.h */
   {"numversion",		&egg_numver,		2},
   {"die-on-sighup",		&die_on_sighup,		1},
   {"die-on-sigterm",		&die_on_sigterm,	1},
----------------------- End of diff -----------------------



More information about the Changes mailing list