From 6a85e665db2be62f349d08e8209e3c2214987427 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Sun, 25 Sep 2011 17:26:01 +0200
Subject: [PATCH] If use_forward=no, ignore any forwarding for joins by local
 users.

---
 modules/core/m_join.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index bdd2df1d3..f5edea230 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -100,8 +100,8 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 	if ((*err = can_join(source_p, chptr, key, &next)) == 0)
 		return chptr;
 
-	/* User is +Q */
-	if (IsNoForward(source_p))
+	/* User is +Q, or forwarding disabled */
+	if (IsNoForward(source_p) || !ConfigChannel.use_forward)
 		return NULL;
 
 	while (depth < 16)