Binary files unreal/.hg/dirstate and unreal.new/.hg/dirstate differ
diff -rupN unreal/include/config.h unreal.new/include/config.h
--- unreal/include/config.h	2012-07-06 14:09:44.040462872 -0500
+++ unreal.new/include/config.h	2012-07-06 14:08:49.484464085 -0500
@@ -76,6 +76,13 @@
 #define USE_POLL
 
 /*
+ * Defining this will disable chanmodes +qa (owner/protect)
+ *
+ * This is enabled by default for backwards compat.
+ */
+#define USE_CHANQA
+
+/*
  * Defining this will allow all ircops to see people in +s channels
  * By default, only net/tech admins can see this
  */
@@ -86,7 +93,7 @@
  */
 #define ADMINCHAT 1
 
-/* 
+/*
  * If channel mode is +z, only send to secure links & people
  *
 */
diff -rupN unreal/src/channel.c unreal.new/src/channel.c
--- unreal/src/channel.c	2012-07-06 14:09:44.084462247 -0500
+++ unreal.new/src/channel.c	2012-07-06 14:00:06.800462640 -0500
@@ -98,8 +98,12 @@ aCtab cFlagTab[] = {
 	{MODE_RGSTR, 'r', 0, 0},
 	{MODE_RGSTRONLY, 'R', 0, 0},
 	{MODE_NOCOLOR, 'c', 0, 0},
+	/* This disables chanmode +qa by simply removing
+	   the ability to set the mode(s) -katsklaw */
+#ifdef USE_CHANQA
 	{MODE_CHANPROT, 'a', 0, 1},
 	{MODE_CHANOWNER, 'q', 0, 1},
+#endif
 	{MODE_OPERONLY, 'O', 0, 0},
 	{MODE_ADMONLY, 'A', 0, 0},
 	{MODE_LINK, 'L', 0, 1},
diff -rupN unreal/src/s_conf.c unreal.new/src/s_conf.c
--- unreal/src/s_conf.c	2012-07-06 14:09:44.208460747 -0500
+++ unreal.new/src/s_conf.c	2012-07-06 14:05:31.152463699 -0500
@@ -958,6 +958,11 @@ int channellevel_to_int(char *s)
 		return CHFL_HALFOP;
 	if (!strcmp(s, "op") || !strcmp(s, "chanop"))
 		return CHFL_CHANOP;
+	/* We disallow the use of chanprot/owner for default channel
+	   level in unreal.conf if USE_CHANQA is undefined.
+
+		Are we allowed to nest ifdef's?? -katsklaw */
+#ifdef USE_CHANQA
 	if (!strcmp(s, "protect") || !strcmp(s, "chanprot"))
 #ifdef PREFIX_AQ
 		return CHFL_CHANPROT;
@@ -970,7 +975,7 @@ int channellevel_to_int(char *s)
 #else
 		return CHFL_CHANOP|CHFL_CHANOWNER;
 #endif
-	
+#endif
 	return 0; /* unknown or unsupported */
 }