From: Alexander Barton <alex@barton.de>
Date: Sat, 6 Oct 2012 20:37:57 +0000 (+0200)
Subject: Merge branch 'bug141-ModesQq'
X-Git-Tag: rel-20-rc1~47
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=c9d166747d4ea161c55c765edc23e2cd3bd7dec4

Merge branch 'bug141-ModesQq'

This closes bug #141.

* bug141-ModesQq:
  KICK-protect IRC services
  Implement channel mode "Q" and user mode "q"

Conflicts:
	src/ngircd/defines.h
	src/ngircd/messages.h
---

c9d166747d4ea161c55c765edc23e2cd3bd7dec4
diff --cc src/ngircd/defines.h
index 1eb3337d,c0be813a..37ca6764
--- a/src/ngircd/defines.h
+++ b/src/ngircd/defines.h
@@@ -161,10 -161,10 +161,10 @@@
  #endif
  
  /** Supported user modes. */
- #define USERMODES "aBcCiorRswx"
+ #define USERMODES "aBcCioqrRswx"
  
  /** Supported channel modes. */
- #define CHANMODES "abehiIklmMnoOPqrRstvVz"
 -#define CHANMODES "abehiIklmMnoOPqQrRstvz"
++#define CHANMODES "abehiIklmMnoOPqQrRstvVz"
  
  /** Away message for users connected to linked servers. */
  #define DEFAULT_AWAY_MSG "Away"
diff --cc src/ngircd/messages.h
index ac75daf9,ea24b2eb..b94a999a
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@@ -21,7 -21,7 +21,7 @@@
  #define RPL_YOURHOST_MSG		"002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
  #define RPL_CREATED_MSG			"003 %s :This server has been started %s"
  #define RPL_MYINFO_MSG			"004 %s %s ngircd-%s %s %s"
- #define RPL_ISUPPORT1_MSG		"005 %s RFC2812 IRCD=ngIRCd CHARSET=UTF-8 CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstVz CHANLIMIT=#&+:%d :are supported on this server"
 -#define RPL_ISUPPORT1_MSG		"005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPQRstz CHANLIMIT=#&+:%d :are supported on this server"
++#define RPL_ISUPPORT1_MSG		"005 %s RFC2812 IRCD=ngIRCd CHARSET=UTF-8 CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPQRstVz CHANLIMIT=#&+:%d :are supported on this server"
  #define RPL_ISUPPORT2_MSG		"005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server"
  
  #define RPL_TRACELINK_MSG		"200 %s Link %s-%s %s %s V%s %ld %d %d"