Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_restrictmsg.cpp

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index e0887e58714dc051e8a3945e6dab10e8cd9ef5b5..279775d480570621bb58a9f3464c390271a0d0b7 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -33,8 +33,9 @@ class ModuleRestrictMsg : public Module
                        // message allowed if:
                        // (1) the sender is opered
                        // (2) the recipient is opered
+                       // (3) the recipient is on a ulined server
                        // anything else, blocked.
-                       if (u->IsOper() || user->IsOper())
+                       if (u->IsOper() || user->IsOper() || u->server->IsULine())
                        {
                                return MOD_RES_PASSTHRU;
                        }