X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=blobdiff_plain;f=ircd%2Fircd_features.c;h=6bb973e551d1e43822e3dcff17487c3b8db36f1a;hp=ca268bc03548444cd26bc3d7dc07fd081b57fbae;hb=f6892ecd79c6113544106e32374075f489bf95a7;hpb=c3727b053aa20cecf3984cc0c9c23b0140edf52c

diff --git a/ircd/ircd_features.c b/ircd/ircd_features.c
index ca268bc..6bb973e 100644
--- a/ircd/ircd_features.c
+++ b/ircd/ircd_features.c
@@ -330,10 +330,19 @@ static struct FeatureDesc {
   F_B(WEBIRC_REJECT, 0, 1, 0),
   F_B(LOC_ENABLE, 0, 0, 0),
   F_S(LOC_TARGET, FEAT_NULL, 0, 0),
-  F_B(EXCEPT_ENABLE, 0, 1, 0),
   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_SSLCHANNEL, FEAT_CASE, "Cannot join channel (+S)", 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),
@@ -428,13 +437,14 @@ 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),
   F_B(CHMODE_A_ENABLE, 0, 0, 0),
   F_S(CHMODE_A_TARGET, FEAT_NULL, 0, 0),
+  F_B(CHMODE_A_NOSET, 0, 0, 0),
   F_B(CHMODE_F_ENABLE, 0, 0, 0),
+  F_B(HALFOP, 0, 0, 0),
   
 #undef F_S
 #undef F_B