[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sun Dec 9 21:23:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-10 03:22:39 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/ctcp/ctcp.c
     modules/filesys/filesys.c modules/server/server.c src/cmds.c
     src/dcc.c src/flags.c src/modules.c src/tcl.c

Log message:

require-p is now gone as a config setting

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/html/egg-core.html
diff -u eggdrop1.7/doc/html/egg-core.html:1.22 eggdrop1.7/doc/html/egg-core.html:1.23
--- eggdrop1.7/doc/html/egg-core.html:1.22	Sun Dec  9 20:38:56 2001
+++ eggdrop1.7/doc/html/egg-core.html	Sun Dec  9 21:22:28 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: egg-core.html,v 1.22 2001/12/10 02:38:56 guppy Exp $ -->
+<!-- $Id: egg-core.html,v 1.23 2001/12/10 03:22:28 guppy Exp $ -->
 
 <html>
   <head>
@@ -492,15 +492,6 @@
         <dd>
           <p>Set here the maximum number of dcc connections you will allow -
           you can increase this later, but never decrease it.</p>
-        </dd>
-
-        <dt><strong><em>set require-p 0</em></strong></dt>
-
-        <dd>
-          <p>Define here if +o user still need the +p flag to dcc the
-          bot.</p>
-
-          <p>Valid settings are 0 and 1.</p>
         </dd>
 
         <dt><strong>set dcc-flood-thr 3</strong></dt>
Index: eggdrop1.7/doc/settings/core.settings
diff -u eggdrop1.7/doc/settings/core.settings:1.18 eggdrop1.7/doc/settings/core.settings:1.19
--- eggdrop1.7/doc/settings/core.settings:1.18	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/doc/settings/core.settings	Sun Dec  9 21:22:28 2001
@@ -297,11 +297,6 @@
     increase this later, but never decrease it.
 
 
-set require-p 0
-    Define here if +o user still need the +p flag to dcc the bot.
-    Valid settings are 0 for OFF and 1 ON.
-
-
 set dcc-flood-thr 3
     Specify here the number of lines from a user on the partyline (dcc, telnet)
     before they are considered to be flooding (and therefore get booted)
Index: eggdrop1.7/eggdrop.complete.conf
diff -u eggdrop1.7/eggdrop.complete.conf:1.59 eggdrop1.7/eggdrop.complete.conf:1.60
--- eggdrop1.7/eggdrop.complete.conf:1.59	Sun Dec  9 20:50:54 2001
+++ eggdrop1.7/eggdrop.complete.conf	Sun Dec  9 21:22:27 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.59 2001/12/10 02:50:54 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.60 2001/12/10 03:22:27 guppy Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -216,10 +216,6 @@
 
 # and a timeout value for ident lookups would help (seconds)
 set ident-timeout 5
-
-# [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] 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.15 eggdrop1.7/help/core.help:1.16
--- eggdrop1.7/help/core.help:1.15	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/help/core.help	Sun Dec  9 21:22:28 2001
@@ -114,7 +114,6 @@
 switch-logfiles-at
 connect-timeout
 reserved-portrange
-require-p
 keep-all-logs
 firewall
 console
Index: eggdrop1.7/help/set/cmds2.help
diff -u eggdrop1.7/help/set/cmds2.help:1.7 eggdrop1.7/help/set/cmds2.help:1.8
--- eggdrop1.7/help/set/cmds2.help:1.7	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/help/set/cmds2.help	Sun Dec  9 21:22:28 2001
@@ -50,10 +50,6 @@
    uses for this.
 
 see also: set firewall
-%{help=set require-p}%{+n}
-###  %bset require-p%b <0/1>
-   specifies whether users with 'o' (global op) also need
-   the 'p' flag to join the party line.
 %{help=set keep-all-logs}%{+n}
 ###  %bset keep-all-logs%b <0/1>
    specifies whether to keep logs older than 48 hours or not.  if
Index: eggdrop1.7/lib/eggdrop/module.h
diff -u eggdrop1.7/lib/eggdrop/module.h:1.4 eggdrop1.7/lib/eggdrop/module.h:1.5
--- eggdrop1.7/lib/eggdrop/module.h:1.4	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/lib/eggdrop/module.h	Sun Dec  9 21:22:28 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.4 2001/12/10 02:38:57 guppy Exp $
+ * $Id: module.h,v 1.5 2001/12/10 03:22:28 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -191,7 +191,7 @@
 #define share_greet (*(int *)global[99])
 /* 100 - 103 */
 #define max_dcc (*(int *)global[100])
-#define require_p (*(int *)global[101])
+/* #define require_p (*(int *)global[101]) */
 #define ignore_time (*(int *)(global[102]))
 /* #define use_console_r (*(int *)(global[103])) */
 /* 104 - 107 */
Index: eggdrop1.7/modules/ctcp/ctcp.c
diff -u eggdrop1.7/modules/ctcp/ctcp.c:1.1 eggdrop1.7/modules/ctcp/ctcp.c:1.2
--- eggdrop1.7/modules/ctcp/ctcp.c:1.1	Sat Oct 27 11:34:49 2001
+++ eggdrop1.7/modules/ctcp/ctcp.c	Sun Dec  9 21:22:28 2001
@@ -2,7 +2,7 @@
  * ctcp.c -- part of ctcp.mod
  *   all the ctcp handling (except DCC, it's special ;)
  *
- * $Id: ctcp.c,v 1.1 2001/10/27 16:34:49 ite Exp $
+ * $Id: ctcp.c,v 1.2 2001/12/10 03:22:28 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -148,9 +148,7 @@
 {
   int atr = u ? u->flags : 0, i;
 
-  if ((atr & (USER_PARTY | USER_XFER)) ||
-      ((atr & USER_OP) && !require_p)) {
-
+  if ((atr & (USER_PARTY | USER_XFER))) {
     for (i = 0; i < dcc_total; i++) {
       if ((dcc[i].type->flags & DCT_LISTEN) &&
 	  (!strcmp(dcc[i].nick, "(telnet)") ||
Index: eggdrop1.7/modules/filesys/filesys.c
diff -u eggdrop1.7/modules/filesys/filesys.c:1.2 eggdrop1.7/modules/filesys/filesys.c:1.3
--- eggdrop1.7/modules/filesys/filesys.c:1.2	Tue Oct 30 22:02:50 2001
+++ eggdrop1.7/modules/filesys/filesys.c	Sun Dec  9 21:22:29 2001
@@ -2,7 +2,7 @@
  * filesys.c -- part of filesys.mod
  *   main file of the filesys eggdrop module
  *
- * $Id: filesys.c,v 1.2 2001/10/31 04:02:50 tothwolf Exp $
+ * $Id: filesys.c,v 1.3 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -780,7 +780,7 @@
   param = newsplit(&msg);
   if (dcc_total == max_dcc) {
     putlog(LOG_MISC, "*", _("DCC connections full: %s %s (%s!%s)"), "CHAT(file)", param, nick, from);
-  } else if (glob_party(fr) || (!require_p && chan_op(fr)))
+  } else if (glob_party(fr))
     return 0;			/* Allow ctcp.so to pick up the chat */
   else if (!glob_xfer(fr)) {
     if (!quiet_reject)
Index: eggdrop1.7/modules/server/server.c
diff -u eggdrop1.7/modules/server/server.c:1.4 eggdrop1.7/modules/server/server.c:1.5
--- eggdrop1.7/modules/server/server.c:1.4	Sun Dec  9 20:50:55 2001
+++ eggdrop1.7/modules/server/server.c	Sun Dec  9 21:22:29 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.4 2001/12/10 02:50:55 guppy Exp $
+ * $Id: server.c,v 1.5 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1402,7 +1402,7 @@
     if (!quiet_reject)
       dprintf(DP_HELP, "NOTICE %s :%s\n", nick, _("Sorry, too many DCC connections."));
     putlog(LOG_MISC, "*", _("DCC connections full: %s %s (%s!%s)"), "CHAT", param, nick, from);
-  } else if (!(glob_party(fr) || (!require_p && chan_op(fr)))) {
+  } else if (!glob_party(fr)) {
     if (glob_xfer(fr))
       return 0;			/* Allow filesys to pick up the chat */
     if (!quiet_reject)
Index: eggdrop1.7/src/cmds.c
diff -u eggdrop1.7/src/cmds.c:1.80 eggdrop1.7/src/cmds.c:1.81
--- eggdrop1.7/src/cmds.c:1.80	Sun Dec  9 15:38:12 2001
+++ eggdrop1.7/src/cmds.c	Sun Dec  9 21:22:29 2001
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.80 2001/12/09 21:38:12 guppy Exp $
+ * $Id: cmds.c,v 1.81 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -33,7 +33,7 @@
 extern struct dcc_t	*dcc;
 extern struct userrec	*userlist;
 extern int		 dcc_total, remote_boots, backgrd, make_userfile,
-			 do_restart, conmask, require_p, strict_host,
+			 do_restart, conmask, strict_host,
 			 term_z, con_chan;
 extern unsigned long	 otraffic_irc, otraffic_irc_today,
 			 itraffic_irc, itraffic_irc_today,
@@ -1327,12 +1327,10 @@
 	  !(u->flags & USER_MASTER))
 	stat |= STAT_PARTY;
       if ((stat & STAT_CHAT) && !(u->flags & USER_PARTY) &&
-	  !(u->flags & USER_MASTER) &&
-	  (!(u->flags & USER_OP) || require_p))
+	  !(u->flags & USER_MASTER))
 	stat &= ~STAT_CHAT;
       if ((dcc[i].type->flags & DCT_FILES) && !(stat & STAT_CHAT) &&
-	  ((u->flags & USER_MASTER) || (u->flags & USER_PARTY) ||
-	   ((u->flags & USER_OP) && !require_p)))
+	  ((u->flags & USER_MASTER) || (u->flags & USER_PARTY)))
 	stat |= STAT_CHAT;
       dcc[i].status = stat;
       /* Check if they no longer have access to wherever they are.
@@ -2087,8 +2085,7 @@
     dprintf(idx, "You cannot currently double .su, try .su'ing directly\n");
   else {
     get_user_flagrec(u, &fr, NULL);
-    if ((!glob_party(fr) && (require_p || !(glob_op(fr) || chan_op(fr)))) &&
-	!(atr & USER_BOTMAST))
+    if (!glob_party(fr) && !(atr & USER_BOTMAST))
       dprintf(idx, "No party line access permitted for %s.\n", par);
     else {
       correct_handle(par);
Index: eggdrop1.7/src/dcc.c
diff -u eggdrop1.7/src/dcc.c:1.65 eggdrop1.7/src/dcc.c:1.66
--- eggdrop1.7/src/dcc.c:1.65	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/src/dcc.c	Sun Dec  9 21:22:29 2001
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.65 2001/12/10 02:38:57 guppy Exp $
+ * $Id: dcc.c,v 1.66 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -50,8 +50,6 @@
 int	dcc_total = 0;		/* Total dcc's				   */
 char	tempdir[121] = "";	/* Temporary directory
 				   (default: current directory)		   */
-int	require_p = 0;		/* Require 'p' access to get on the
-				   party line?				   */
 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  */
@@ -1304,10 +1302,6 @@
     dprintf(idx, "\nEnter the nickname you would like to use.\n");
     return;
   }
-  if (chan_op(fr)) {
-    if (!require_p)
-      ok = 1;
-  }
   if (!ok && (glob_party(fr) || glob_bot(fr)))
     ok = 1;
   if (!ok && glob_xfer(fr)) {
@@ -1389,12 +1383,7 @@
   dcc[idx].timeval = now;
   if (glob_botmast(fr))
     ok = 1;
-  else if (chan_op(fr)) {
-    if (!require_p)
-      ok = 1;
-    else if (glob_party(fr))
-      ok = 1;
-  } else if (glob_party(fr)) {
+  else if (glob_party(fr)) {
     ok = 1;
     dcc[idx].status |= STAT_PARTY;
   }
@@ -1944,9 +1933,7 @@
     /* Not a user or +p & require p OR +o */
     if (!u)
       ok = 0;
-    else if (require_p && !(u->flags & USER_PARTY))
-      ok = 0;
-    else if (!require_p && !(u->flags & USER_OP))
+    else if (!(u->flags & USER_PARTY))
       ok = 0;
     if (!ok && u && (u->flags & USER_BOT))
       ok = 1;
Index: eggdrop1.7/src/flags.c
diff -u eggdrop1.7/src/flags.c:1.23 eggdrop1.7/src/flags.c:1.24
--- eggdrop1.7/src/flags.c:1.23	Fri Oct 19 01:01:21 2001
+++ eggdrop1.7/src/flags.c	Sun Dec  9 21:22:29 2001
@@ -2,7 +2,7 @@
  * flags.c -- handles:
  *   all the flag matching/conversion functions in one neat package :)
  *
- * $Id: flags.c,v 1.23 2001/10/19 06:01:21 guppy Exp $
+ * $Id: flags.c,v 1.24 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -26,7 +26,7 @@
 #include "main.h"
 
 
-extern int		 debug_output, require_p, noshare, allow_dk_cmds;
+extern int		 debug_output, noshare, allow_dk_cmds;
 extern struct dcc_t	*dcc;
 
 int logmodes(char *s)
@@ -539,11 +539,6 @@
       }
       return 1;
     }
-    /* The +n/+m checks arent needed anymore since +n/+m
-     * automatically add lower flags
-     */
-    if (!require_p && ((hav & USER_OP) || (have->chan & USER_OWNER)))
-      hav |= USER_PARTY;
     if (hav & req->global)
       return 1;
     if (have->chan & req->chan)
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.88 eggdrop1.7/src/modules.c:1.89
--- eggdrop1.7/src/modules.c:1.88	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/src/modules.c	Sun Dec  9 21:22:29 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.88 2001/12/10 02:38:57 guppy Exp $
+ * $Id: modules.c,v 1.89 2001/12/10 03:22:29 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -50,7 +50,7 @@
 			 ignore_time, learn_users,
 			 debug_output, gban_total, make_userfile,
 			 gexempt_total, ginvite_total, default_flags,
-			 require_p, max_dcc, share_greet, password_timeout,
+			 max_dcc, share_greet, password_timeout,
 			 use_invites, use_exempts, force_expire, do_restart,
 			 protect_readonly, reserved_port_min, reserved_port_max;
 extern time_t now, online_since;
@@ -268,7 +268,7 @@
   (Function) & share_greet,	 /* int					*/
   /* 100 - 103 */
   (Function) & max_dcc,		 /* int					*/
-  (Function) & require_p,	 /* int					*/
+  (Function) 0,
   (Function) & ignore_time,	 /* int					*/
   (Function) 0,
   /* 104 - 107 */
Index: eggdrop1.7/src/tcl.c
diff -u eggdrop1.7/src/tcl.c:1.59 eggdrop1.7/src/tcl.c:1.60
--- eggdrop1.7/src/tcl.c:1.59	Sun Dec  9 20:38:57 2001
+++ eggdrop1.7/src/tcl.c	Sun Dec  9 21:22:29 2001
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.59 2001/12/10 02:38:57 guppy Exp $
+ * $Id: tcl.c,v 1.60 2001/12/10 03:22:29 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -47,7 +47,7 @@
 
 extern time_t	online_since;
 extern int	backgrd, flood_telnet_thr, flood_telnet_time;
-extern int	shtime, share_greet, require_p;
+extern int	shtime, share_greet;
 extern int	learn_users, stealth_telnets;
 extern int	default_flags, conmask, connect_timeout;
 extern int	firewallport, notify_users_at, flood_thr, ignore_time;
@@ -335,7 +335,6 @@
   {"hourly-updates",		&notify_users_at,	0},
   {"connect-timeout",		&connect_timeout,	0},
   {"reserved-port",		&reserved_port_min,	0},
-  {"require-p",			&require_p,		0},
   {"learn-users",		&learn_users,		0},
   {"stealth-telnets",		&stealth_telnets,	0},
   {"uptime",			(int *) &online_since,	2},
----------------------- End of diff -----------------------



More information about the Changes mailing list