autogen.sh is not necessary at this time, and did not work anyway.

[irc/rqf/shadowircd.git] / src / chmode.c

diff --git a/src/chmode.c b/src/chmode.c
index b6ece72cb0f66b9918c83cc743db65da942496a2..df59c336b136ac4beacfda14676f89dcc8064105 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -65,13 +65,22 @@ static int mode_limit;
 static int mode_limit_simple;
 static int mask_pos;
 
+char cflagsbuf[256];
+char cflagsmyinfo[256];
+
 int chmode_flags[256];
+
 /* OPTIMIZE ME! -- dwr */
 void
 construct_noparam_modes(void)
 {
        int i;
+        char *ptr = cflagsbuf;
+       char *ptr2 = cflagsmyinfo;
         static int prev_chmode_flags[256];
+        
+        *ptr = '\0';
+       *ptr2 = '\0';
 
        for(i = 0; i < 256; i++)
        {
@@ -105,7 +114,40 @@ construct_noparam_modes(void)
                }
                else
                        prev_chmode_flags[i] = chmode_flags[i];
+                
+               switch (chmode_flags[i])
+               {
+                   case MODE_EXLIMIT:
+                   case MODE_DISFORWARD:
+                       if(ConfigChannel.use_forward)
+                       {
+                           *ptr++ = (char) i;
+                       }
+                       
+                       break;
+                   case MODE_REGONLY:
+                       if(rb_dlink_list_length(&service_list))
+                       {
+                           *ptr++ = (char) i;
+                       }
+
+                       break;
+                   default:
+                       if(chmode_flags[i] != 0)
+                       {
+                           *ptr++ = (char) i;
+                       }
+               }
+               
+               /* Should we leave orphaned check here? -- dwr */
+               if(!(chmode_table[i].set_func == chm_nosuch) && !(chmode_table[i].set_func == chm_orphaned))
+               {
+                   *ptr2++ = (char) i;
+               }
        }
+        
+        *ptr++ = '\0';
+       *ptr2++ = '\0';
 }
 
 /*
@@ -459,7 +501,6 @@ chm_simple(struct Client *source_p, struct Channel *chptr,
                return;
        }
 
-       /* flags (possibly upto 32) + 4 with param */
        if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
                return;