Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / s_user.c

diff --git a/ircd/s_user.c b/ircd/s_user.c
index 9ad2b2e90c3c7c12cc8b247031454b6cc2c58334..12ec78201d3b639b1a1e789350f6dd62b43905c3 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -276,7 +276,7 @@ int hunt_server_prio_cmd(struct Client *from, const char *cmd, const char *tok,
     return HUNTED_NOSUCH;
   }
 
-  assert(!IsServer(from));
+  /* assert(!IsServer(from)); SETTIME to particular destinations permitted */
 
   parv[server] = (char *) acptr; /* HACK! HACK! HACK! ARGH! */
 
@@ -1048,7 +1048,6 @@ void send_user_info(struct Client* sptr, char* names, int rpl, InfoFormatter fmt
  * If, after setting the flags, the user has both HiddenHost and Account
  * set, its hostmask is changed.
  */
-#define FLAGS_HOST_HIDDEN      (FLAGS_ACCOUNT|FLAGS_HIDDENHOST)
 int
 hide_hostmask(struct Client *cptr, unsigned int flag)
 {
@@ -1066,6 +1065,11 @@ hide_hostmask(struct Client *cptr, unsigned int flag)
   ircd_snprintf(0, cli_user(cptr)->host, HOSTLEN, "%s.%s",
                 cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
 
+  /* ok, the client is now fully hidden, so let them know -- hikari */
+  if (MyConnect(cptr))
+    send_reply(cptr, RPL_HOSTHIDDEN, cli_user(cptr)->account,
+              feature_str(FEAT_HIDDEN_HOST));
+
   /*
    * Go through all channels the client was on, rejoin him
    * and set the modes, if any
@@ -1283,7 +1287,8 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv
   }
   if (MyConnect(sptr))
   {
-    if (FlagHas(&setflags, FLAG_OPER) || FlagHas(&setflags, FLAG_LOCOP))
+    if (FlagHas(&setflags, FLAG_OPER) || FlagHas(&setflags, FLAG_LOCOP) &&
+       !IsAnOper(sptr))
       det_confs_butmask(sptr, CONF_CLIENT & ~CONF_OPS);
 
     if (SendServNotice(sptr))
@@ -1304,7 +1309,7 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv
   {
     /* user now oper */
     ++UserStats.opers;
-    client_set_privs(sptr, NULL);
+    client_set_privs(sptr, NULL); /* may set propagate privilege */
   }
   /* remember propagate privilege setting */
   if (HasPriv(sptr, PRIV_PROPAGATE))