X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0eceaff17a0fd935caa086ee43b328b0ea9282a5..dc34aae05e6e299a6c53c60b728d73ecb88b21bf:/src/supported.c

diff --git a/src/supported.c b/src/supported.c
index 14cee91..abeb60c 100644
--- a/src/supported.c
+++ b/src/supported.c
@@ -28,7 +28,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: supported.c 3568 2007-09-09 18:59:08Z jilles $
  */
 
 /* From the old supported.h which is
@@ -116,7 +115,7 @@ change_isupport(const char *name, const char *(*func)(const void *), const void
 {
 	rb_dlink_node *ptr;
 	struct isupportitem *item;
-	const void *oldvalue;
+	const void *oldvalue = NULL;
 
 	RB_DLINK_FOREACH(ptr, isupportlist.head)
 	{
@@ -236,10 +235,12 @@ isupport_chanmodes(const void *ptr)
 {
 	static char result[80];
 
-	rb_snprintf(result, sizeof result, "%s%sbq,k,%slj,%s",
+	rb_snprintf(result, sizeof result, "%s%sb%s,k,%sl%s,%s",
 			ConfigChannel.use_except ? "e" : "",
 			ConfigChannel.use_invex ? "I" : "",
+			strcasecmp(ConfigChannel.disabledmodes, "q") ? "" : "q",
 			ConfigChannel.use_forward ? "f" : "",
+			strcasecmp(ConfigChannel.disabledmodes, "j") ? "" : "j",
 			cflagsbuf);
 	return result;
 }
@@ -267,9 +268,9 @@ isupport_prefix(const void *ptr)
 	static char result[11];
 
 	rb_snprintf(result, sizeof result, "(%so%sv)%s@%s+",
-			ConfigChannel.use_owner ? "a" : "",
+			ConfigChannel.use_admin ? "a" : "",
 			ConfigChannel.use_halfop ? "h" : "",
-			ConfigChannel.use_owner ? "!" : "",
+			ConfigChannel.use_admin ? "!" : "",
 			ConfigChannel.use_halfop ? "%" : "");
 	return result;
 }