Do not spuriously promote remote users to global operator status.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1397 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 0bbb784e1b80df6b2da36bde2dbf9e860634aeaa..0b0384fcf9b782098882b0b5369623cee6e96a85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/s_user.c (umode_str): Only clear the operator flag when not
+       propagating; never set it.
+
 2005-05-04  Michael Poole <mdpoole@troilus.org>
 
        * ircd/channel.c (joinbuf_join): Include channel manager flag in

diff --git a/ircd/s_user.c b/ircd/s_user.c
index fec640aab124f0343559ba82bc7a6fd264af744e..ed9ccd61de5d07dd5b3322fc6f96029ca890145b 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1462,9 +1462,7 @@ char *umode_str(struct Client *cptr)
   int i;
   struct Flags c_flags = cli_flags(cptr);
 
-  if (HasPriv(cptr, PRIV_PROPAGATE))
-    FlagSet(&c_flags, FLAG_OPER);
-  else
+  if (!HasPriv(cptr, PRIV_PROPAGATE))
     FlagClr(&c_flags, FLAG_OPER);
 
   for (i = 0; i < USERMODELIST_SIZE; ++i)