um_callerid: Only people can have common channels

diff --git a/modules/um_callerid.c b/modules/um_callerid.c
index 12b9033b090d54ce4054ef1de75536b5d01d8027..897435982064c7eadf7833c25b8d93ffec649198 100644 (file)
--- a/modules/um_callerid.c
+++ b/modules/um_callerid.c
@@ -96,10 +96,12 @@ allow_message(struct Client *source_p, struct Client *target_p)
        if (!IsSetAnyCallerID(target_p))
                return true;
 
-       if (IsSetRelaxedCallerID(target_p) && has_common_channel(source_p, target_p) && !IsSetStrictCallerID(target_p))
+       if (!IsPerson(source_p))
                return true;
 
-       if (IsServer(source_p))
+       if (IsSetRelaxedCallerID(target_p) &&
+                       !IsSetStrictCallerID(target_p) &&
+                       has_common_channel(source_p, target_p))
                return true;
 
        /* XXX: controversial?  allow opers to send through +g */

diff --git a/modules/um_regonlymsg.c b/modules/um_regonlymsg.c
index 3b31006a3b665a6d349158b11c383aa6b0741875..79f8ab0f1aa7032c39bb88f94c8251a531592205 100644 (file)
--- a/modules/um_regonlymsg.c
+++ b/modules/um_regonlymsg.c
@@ -78,7 +78,7 @@ allow_message(struct Client *source_p, struct Client *target_p)
        if (!IsSetRegOnlyMsg(target_p))
                return true;
 
-       if (IsServer(source_p))
+       if (!IsPerson(source_p))
                return true;
 
        /* XXX: controversial?  allow opers to send through +R */