If use_forward=no, ignore any forwarding for joins by local users.

[solanum.git] / modules / core / m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index bdd2df1d381a256b1e302891c075f2d9633645a8..f5edea2302f1755fe9c3502dfb1d2c077617aa4f 100644 (file)
--- 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)