X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_whois.c;h=01c9db55db3d1d8311a6b89f76bc40ffa79a9930;hb=refs%2Fheads%2Fupstream;hp=8a28793d3c966f8687a00d3123c441c57d233b57;hpb=7e7b05cccb573a5982baaf145e5b3e4e578f0272;p=ircu2.10.12-pk.git

diff --git a/ircd/m_whois.c b/ircd/m_whois.c
index 8a28793..01c9db5 100644
--- a/ircd/m_whois.c
+++ b/ircd/m_whois.c
@@ -138,7 +138,7 @@ static void do_whois(struct Client* sptr, struct Client *acptr, int parc)
   const struct User* user = cli_user(acptr);
   const char* name = (!*(cli_name(acptr))) ? "?" : cli_name(acptr);  
   a2cptr = feature_bool(FEAT_HIS_WHOIS_SERVERNAME) && !IsAnOper(sptr)
-      && sptr != acptr ? user->server : &his;
+      && sptr != acptr ? &his : user->server;
   assert(user);
   send_reply(sptr, RPL_WHOISUSER, name, user->username, user->host,
 		   cli_info(acptr));
@@ -176,7 +176,7 @@ static void do_whois(struct Client* sptr, struct Client *acptr, int parc)
        }
        if (IsDeaf(acptr))
          *(buf + len++) = '-';
-       if (IsOper(sptr) && !ShowChannel(sptr, chptr))
+       if (!ShowChannel(sptr, chptr))
          *(buf + len++) = '*';
        if (IsDelayedJoin(chan) && (sptr != acptr))
          *(buf + len++) = '<';
@@ -235,7 +235,6 @@ static int do_wilds(struct Client* sptr, char *nick, int count, int parc)
 {
   struct Client *acptr; /* Current client we're considering */
   struct User *user; 	/* the user portion of the client */
-  const char *name; 	/* the name of this client */
   struct Membership* chan; 
   int invis; 		/* does +i apply? */
   int member;		/* Is this user on any channels? */
@@ -273,7 +272,6 @@ static int do_wilds(struct Client* sptr, char *nick, int count, int parc)
      *   the target user(s) are on;
      */
     user = cli_user(acptr);
-    name = (!*(cli_name(acptr))) ? "?" : cli_name(acptr);
     assert(user);
 
     invis = (acptr != sptr) && IsInvisible(acptr);