keep in sync with OGN upstream (SVN-317)

[ircu2.10.12-pk.git] / ircd / ircd_features.c

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index d3bd41fb52fc61fb9d3cd50b21831dea9190cec1..5c57b893d4fd0c0e0ed45f9f641c8052dc2c29a3 100644 (file)
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -333,6 +333,15 @@ static struct FeatureDesc {
   F_I(NOAMSG_TIME, 0, 0, 0),
   F_I(NOAMSG_NUM, 0, 1, 0),
 
+  /* friendly error messages
+   * The errors below are the default */
+  F_S(ERR_CHANNELISFULL, FEAT_CASE, "Cannot join channel (+l)", 0),
+  F_S(ERR_INVITEONLYCHAN, FEAT_CASE, "Cannot join channel (+i)", 0),
+  F_S(ERR_BANNEDFROMCHAN, FEAT_CASE, "Cannot join channel (+b)", 0),
+  F_S(ERR_BADCHANNELKEY, FEAT_CASE, "Cannot join channel (+k)", 0),
+  F_S(ERR_NEEDREGGEDNICK, FEAT_CASE, "Cannot join channel (+r)", 0),
+  F_S(ERR_JOINACCESS, FEAT_CASE, "Cannot join channel (+a)", 0),
+  
   /* features that probably should not be touched */
   F_I(KILLCHASETIMELIMIT, 0, 30, 0),
   F_I(MAXCHANNELSPERUSER, 0, 10, 0),
@@ -427,7 +436,6 @@ static struct FeatureDesc {
   /* Misc. random stuff */
   F_S(NETWORK, 0, "UnderNet", 0),
   F_S(URL_CLIENTS, 0, "ftp://ftp.undernet.org/pub/irc/clients", 0),
-  F_S(URLREG, 0, "http://cservice.undernet.org/live/", 0),
 
   F_B(UNKNOWN_CMD_ENABLE, 0, 0, 0),
   F_S(UNKNOWN_CMD_TARGET, FEAT_NULL, 0, 0),