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 f34562e3fab339df8d3454c5d0a47abb16455c92..abeb60cf38784db4736594728ee79701470ddf3c 100644 (file)
--- a/src/supported.c
+++ b/src/supported.c
@@ -28,7 +28,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: supported.c 3568 2007-09-09 18:59:08Z jilles $
  */
 
 /* From the old supported.h which is
@@ -116,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)
        {
@@ -236,20 +235,43 @@ 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" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
                        ConfigChannel.use_forward ? "f" : "",
+                       strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
                        cflagsbuf);
        return result;
 }
 
+static const char *
+isupport_chantypes(const void *ptr)
+{
+       return ConfigChannel.use_local_channels ? "&#" : "#";
+}
+
 static const char *
 isupport_chanlimit(const void *ptr)
 {
        static char result[30];
 
-       rb_snprintf(result, sizeof result, "&#:%i", ConfigChannel.max_chans_per_user);
+       rb_snprintf(result, sizeof result, "%s:%i",
+                       ConfigChannel.use_local_channels ? "&#" : "#", 
+                       ConfigChannel.max_chans_per_user);
+       return result;
+}
+
+static const char*
+isupport_prefix(const void *ptr)
+{
+       static char result[11];
+
+       rb_snprintf(result, sizeof result, "(%so%sv)%s@%s+",
+                       ConfigChannel.use_admin ? "a" : "",
+                       ConfigChannel.use_halfop ? "h" : "",
+                       ConfigChannel.use_admin ? "!" : "",
+                       ConfigChannel.use_halfop ? "%" : "");
        return result;
 }
 
@@ -297,12 +319,12 @@ init_isupport(void)
        static int channellen = LOC_CHANNELLEN;
        static int topiclen = TOPICLEN;
 
-       add_isupport("CHANTYPES", isupport_string, "&#");
+       add_isupport("CHANTYPES", isupport_chantypes, NULL);
        add_isupport("EXCEPTS", isupport_boolean, &ConfigChannel.use_except);
        add_isupport("INVEX", isupport_boolean, &ConfigChannel.use_invex);
        add_isupport("CHANMODES", isupport_chanmodes, NULL);
        add_isupport("CHANLIMIT", isupport_chanlimit, NULL);
-       add_isupport("PREFIX", isupport_string, "(ov)@+");
+       add_isupport("PREFIX", isupport_prefix, NULL);
        add_isupport("MAXLIST", isupport_maxlist, NULL);
        add_isupport("MODES", isupport_intptr, &maxmodes);
        add_isupport("NETWORK", isupport_stringptr, &ServerInfo.network_name);
@@ -325,4 +347,5 @@ init_isupport(void)
        add_isupport("TARGMAX", isupport_targmax, NULL);
        add_isupport("EXTBAN", isupport_extban, NULL);
        add_isupport("WHOX", isupport_string, "");
+       add_isupport("CLIENTVER", isupport_string, "3.0");
 }