welcome: only allow announce for local welcome by oper

diff --git a/welcome.patch b/welcome.patch
index 8910e2ae34829b40f89a1f39daa7b04481a8ca4f..e627191b2c942ad420ea29b66c02c228fcbdb452 100644 (file)
--- a/welcome.patch
+++ b/welcome.patch
@@ -375,7 +375,7 @@ diff -r 8c7c9ff0f0ca ircd/ircd_parser.y
 diff -r 8c7c9ff0f0ca ircd/m_welcome.c
 --- /dev/null
 +++ b/ircd/m_welcome.c
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,292 @@
 +/*
 + * IRC - Internet Relay Chat, ircd/m_welcome.c
 + * Copyright (C) 1990 Jarkko Oikarinen and
@@ -579,14 +579,12 @@ diff -r 8c7c9ff0f0ca ircd/m_welcome.c
 +    flags |= WELCOME_LOCAL; 
 +  }
 +
-+  /* TODO: disallow global announcement from oper?
-+   * as PRIVMSG/NOTICE to $* is not allowed either by the ircd
-+   * when PRIV for that is added, use that here? PRIV_BROADCAST or something
-+   */
 +  /* check for anounce prefix */
 +  if (*name == '$') {
 +     name++;
-+     flags |= WELCOME_ANNOUNCE;
++     /* only allow announce by oper for local welcome */
++     if (flags & WELCOME_LOCAL)
++       flags |= WELCOME_ANNOUNCE;
 +  }
 +
 +  /* check for insert prefix */