Correct error message involving no fingerprint credentials or password credentials...

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

diff --git a/src/supported.c b/src/supported.c
index a8f734adacb13b8c0e4c1e4edd636ed753bda7d8..abeb60cf38784db4736594728ee79701470ddf3c 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -87,9 +87,6 @@
 #include "s_conf.h"
 #include "supported.h"
 #include "chmode.h"
-#include "channel.h"
-
-struct module_modes ModuleModes;
 
 rb_dlink_list isupportlist;
 
@@ -118,7 +115,7 @@ change_isupport(const char *name, const char *(*func)(const void *), const void
 {
        rb_dlink_node *ptr;
        struct isupportitem *item;
-       const void *oldvalue;
+       const void *oldvalue = NULL;
 
        RB_DLINK_FOREACH(ptr, isupportlist.head)
        {
@@ -238,10 +235,12 @@ isupport_chanmodes(const void *ptr)
 {
        static char result[80];
 
-       rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
+       rb_snprintf(result, sizeof result, "%s%sb%s,k,%sl%s,%s",
                        ConfigChannel.use_except ? "e" : "",
                        ConfigChannel.use_invex ? "I" : "",
-                       ModuleModes.MODE_FORWARD ? "f" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
+                       ConfigChannel.use_forward ? "f" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
                        cflagsbuf);
        return result;
 }