repo: ngircd
action: commit
revision: 
path_from: 
revision_from: c9d166747d4ea161c55c765edc23e2cd3bd7dec4:
path_to: 
revision_to: 

commit c9d166747d4ea161c55c765edc23e2cd3bd7dec4
Merge: 56cdc217 9ac94339
Author: Alexander Barton 
Date:   Sat Oct 6 22:37:57 2012 +0200

    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

diff --cc src/ngircd/defines.h
index 1eb3337dfca4e65d09830befd58d9f55984744c3,c0be813a60f74ffec8821fcdff2535394d2a9414..37ca67640331d1aaef54181a7038e8f7b4cfa2ca
--- 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 ac75daf9f09cc5d625c44702c592ea22f29fd6e8,ea24b2eb92708fabbcb4898cf03f3216ae5cf7f0..b94a999a1575102685fbd55373fe76e78434d17d
--- 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"

-----END OF PAGE-----