[svn] Remove invite_ops_only, forcing it to YES.

diff --git a/ChangeLog b/ChangeLog
index 582b0c834837b0702d18fe1b68381e68d40e8b91..a41a92b30448ccead6c1fea4657a5e64dfe9c36a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+jilles      2007/03/06 14:07:11 UTC    (20070306-3255)
+  Log:
+  Move username check after xline and dnsbl checks, so it
+  will not complain to opers about clients who are xlined
+  or blacklisted anyway (both of which silently reject).
+  
+
+  Changes:     Modified:
+  +15 -15      trunk/src/s_user.c (File Modified) 
+
+
 nenolod     2007/03/05 19:01:05 UTC    (20070305-3253)
   Log:
   - MASTER_MAX is no longer relevant

diff --git a/doc/example.conf b/doc/example.conf
index dd10abdbed05c35e955e1101724b83470a5671d8..07d4c0909ad67e8e2db4457d6ac47d0532e4f1d3 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3251 2007-03-05 18:58:38Z nenolod $
+ * $Id: example.conf 3257 2007-03-13 16:09:28Z jilles $
  *
  * See reference.conf for more information.
  */
@@ -268,7 +268,6 @@ channel {
        use_except = yes;
        use_knock = yes;
        use_forward = yes;
-       invite_ops_only = yes;
        knock_delay = 5 minutes;
        knock_delay_channel = 1 minute;
        max_chans_per_user = 15;

diff --git a/doc/reference.conf b/doc/reference.conf
index d5a4f59ece456c9b30e01a8e8817ce15ea38c2d0..e2132818b071245185c0f82ff451078927e5d715 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -6,7 +6,7 @@
  *
  * Written by ejb, wcampbel, db, leeh and others
  *
- * $Id: reference.conf 3251 2007-03-05 18:58:38Z nenolod $
+ * $Id: reference.conf 3257 2007-03-13 16:09:28Z jilles $
  */
 
 /* IMPORTANT NOTES:
@@ -585,11 +585,6 @@ channel {
         */
        use_knock = yes;
 
-       /* invite ops only: Restrict /invite to ops on channels, rather than
-        * allowing unopped users to invite people to a -i channel.
-        */
-       invite_ops_only = yes;
-
        /* knock delay: The amount of time a user must wait between issuing
         * the knock command.
         */

diff --git a/doc/sgml/oper-guide/cmodes.sgml b/doc/sgml/oper-guide/cmodes.sgml
index ee18a4d5f9455229b642f4fcee4c73770cae5e0d..c56a1be1982dd47531aa67ff8cac59540f65afe6 100644 (file)
--- a/doc/sgml/oper-guide/cmodes.sgml
+++ b/doc/sgml/oper-guide/cmodes.sgml
@@ -95,9 +95,7 @@
        <title>+g, allow anybody to invite</title>
        <para>
          When this mode is set, anybody may use the INVITE command on the channel in question. When it
-         is unset, only channel operators may use the INVITE command
-         (unless the invite_ops_only option is disabled and +i is
-         not set).
+         is unset, only channel operators may use the INVITE command.
        </para>
        <para>
          When this mode is set together with +i, all channel members can influence who can join.

diff --git a/include/s_conf.h b/include/s_conf.h
index df1725868dedcf0c13b123354bad77d8ede7dc6f..63f47b399a89c8b3d1cc557a0793f81967eee09b 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.h 3251 2007-03-05 18:58:38Z nenolod $
+ *  $Id: s_conf.h 3257 2007-03-13 16:09:28Z jilles $
  */
 
 #ifndef INCLUDED_s_conf_h
@@ -268,7 +268,6 @@ struct config_channel_entry
        int default_split_server_count;
        int default_split_user_count;
        int burst_topicwho;
-       int invite_ops_only;
        int kick_on_split_riding;
 };
 

diff --git a/include/serno.h b/include/serno.h
index 573323a4697500c4b3a9a234e08aa3ade2363d39..e1146063ea44ef53aacc33acd9b6dc260b333929 100644 (file)
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070305-3253"
+#define SERNO "20070306-3255"

diff --git a/modules/m_info.c b/modules/m_info.c
index e97fabed8c5b1d523e0edcc41d99d15e26bcd7da..1e7e3edfc814907243b9cfcef80d72cf810139e6 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_info.c 3131 2007-01-21 15:36:31Z jilles $
+ *  $Id: m_info.c 3257 2007-03-13 16:09:28Z jilles $
  */
 
 #include "stdinc.h"
@@ -63,7 +63,7 @@ mapi_hlist_av1 info_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3131 $");
+DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3257 $");
 
 /*
  * jdc -- Structure for our configuration value table
@@ -531,12 +531,6 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.knock_delay_channel,
                "Delay between KNOCK attempts to a channel",
        },
-       {
-               "invite_ops_only",
-               OUTPUT_BOOLEAN_YN,
-               &ConfigChannel.invite_ops_only,
-               "INVITE is restricted to channelops only"
-       },
        {
                "kick_on_split_riding",
                OUTPUT_BOOLEAN_YN,

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 8230a30e44f521413fde9b046ad7d749e76dcb67..5e9edc00934db10dd6b64f372a3378e41472c182 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_invite.c 718 2006-02-08 20:26:58Z jilles $
+ *  $Id: m_invite.c 3257 2007-03-13 16:09:28Z jilles $
  */
 
 #include "stdinc.h"
@@ -48,7 +48,7 @@ struct Message invite_msgtab = {
        {mg_unreg, {m_invite, 3}, {m_invite, 3}, mg_ignore, mg_ignore, {m_invite, 3}}
 };
 mapi_clist_av1 invite_clist[] = { &invite_msgtab, NULL };
-DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 718 $");
+DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 3257 $");
 
 static void add_invite(struct Channel *, struct Client *);
 
@@ -126,23 +126,19 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
        }
 
        /* only store invites for +i channels */
-       /* if the invite could allow someone to join who otherwise could not,
-        * unconditionally require ops, unless the channel is +g */
-       if(ConfigChannel.invite_ops_only || (chptr->mode.mode & MODE_INVITEONLY))
+       /* unconditionally require ops, unless the channel is +g */
+       /* treat remote clients as chanops */
+       if(MyClient(source_p) && !is_chanop(msptr) &&
+                       !(chptr->mode.mode & MODE_FREEINVITE))
        {
-               /* treat remote clients as chanops */
-               if(MyClient(source_p) && !is_chanop(msptr) &&
-                               !(chptr->mode.mode & MODE_FREEINVITE))
-               {
-                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                                  me.name, source_p->name, parv[2]);
-                       return 0;
-               }
-
-               if(chptr->mode.mode & MODE_INVITEONLY)
-                       store_invite = 1;
+               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                          me.name, source_p->name, parv[2]);
+               return 0;
        }
 
+       if(chptr->mode.mode & MODE_INVITEONLY)
+               store_invite = 1;
+
        if(MyConnect(source_p))
        {
                sendto_one(source_p, form_str(RPL_INVITING), 

diff --git a/src/newconf.c b/src/newconf.c
index c65633f2984bb22a24731250c0be79a334a0bdc6..81c26abdf0c8726e0f1957ce7d2382e903da16ae 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1,5 +1,5 @@
 /* This code is in the public domain.
- * $Id: newconf.c 3251 2007-03-05 18:58:38Z nenolod $
+ * $Id: newconf.c 3257 2007-03-13 16:09:28Z jilles $
  */
 
 #include "stdinc.h"
@@ -2085,7 +2085,6 @@ static struct ConfEntry conf_channel_table[] =
        { "default_split_user_count",   CF_INT,  NULL, 0, &ConfigChannel.default_split_user_count        },
        { "default_split_server_count", CF_INT,  NULL, 0, &ConfigChannel.default_split_server_count },
        { "burst_topicwho",     CF_YESNO, NULL, 0, &ConfigChannel.burst_topicwho        },
-       { "invite_ops_only",    CF_YESNO, NULL, 0, &ConfigChannel.invite_ops_only       },
        { "kick_on_split_riding", CF_YESNO, NULL, 0, &ConfigChannel.kick_on_split_riding },
        { "knock_delay",        CF_TIME,  NULL, 0, &ConfigChannel.knock_delay           },
        { "knock_delay_channel",CF_TIME,  NULL, 0, &ConfigChannel.knock_delay_channel   },

diff --git a/src/s_conf.c b/src/s_conf.c
index 5cdccf381eae92c0778e0787cb2516d45ed9cdc3..fa3580a2d899315c318f376e4584c4713ef63b2d 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_conf.c 3251 2007-03-05 18:58:38Z nenolod $
+ *  $Id: s_conf.c 3257 2007-03-13 16:09:28Z jilles $
  */
 
 #include "stdinc.h"
@@ -830,7 +830,6 @@ set_default_conf(void)
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
        ConfigChannel.burst_topicwho = NO;
-       ConfigChannel.invite_ops_only = YES;
        ConfigChannel.kick_on_split_riding = NO;
 
        ConfigChannel.default_split_user_count = 15000;