* Don't check for doresolv() if just looking up an ip. m->userip could still be set from WHOX

src/mod/irc.mod/chan.c

@@ -224,7 +224,7 @@ void priority_do(struct chanset_t * chan, bool opsonly, int action)
 
       simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
       m->user = get_user_by_host(s);
-      if (!m->user && doresolv(chan) && m->userip[0]) {
+      if (!m->user && m->userip[0]) {
         simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
         m->user = get_user_by_host(s);
       }
@@ -1338,7 +1338,7 @@ void recheck_channel(struct chanset_t *chan, int dobans)
     if (!m->user && !m->tried_getuser) {
            m->tried_getuser = 1;
            m->user = get_user_by_host(s);
-           if (!m->user && doresolv(chan) && m->userip[0]) {
+           if (!m->user && m->userip[0]) {
              simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
              m->user = get_user_by_host(s);
            }

src/mod/irc.mod/cmdsirc.c

@@ -1242,7 +1242,7 @@ static void cmd_mop(int idx, char *par)
         if (!m->user) {
           simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
           m->user = get_user_by_host(s);
-          if (!m->user && doresolv(chan) && m->userip[0]) {
+          if (!m->user && m->userip[0]) {
             simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
             m->user = get_user_by_host(s);
           }
@@ -1308,7 +1308,7 @@ static void cmd_find(int idx, char *par)
         simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
         if (!m->user && !m->tried_getuser) {
           m->user = get_user_by_host(s);
-          if (!m->user && doresolv(chan) && m->userip[0]) {
+          if (!m->user && m->userip[0]) {
             simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
             m->user = get_user_by_host(s);
           }
@@ -1503,7 +1503,7 @@ static void cmd_channel(int idx, char *par)
       if (m->user == NULL) {
 	simple_snprintf(s1, sizeof s1, "%s!%s", m->nick, m->userhost);
 	m->user = get_user_by_host(s1);
-        if (!m->user && doresolv(chan) && m->userip[0]) {
+        if (!m->user && m->userip[0]) {
           simple_snprintf(s1, sizeof(s1), "%s!%s", m->nick, m->userip);
           m->user = get_user_by_host(s1);
         }

src/mod/irc.mod/irc.c

@@ -1487,7 +1487,7 @@ check_expired_chanstuff(struct chanset_t *chan)
             if (!m->user && !m->tried_getuser) {
               simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
               m->user = get_user_by_host(s);
-              if (!m->user && doresolv(chan) && m->userip[0]) {
+              if (!m->user && m->userip[0]) {
                 simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
                 m->user = get_user_by_host(s);
               }

src/mod/irc.mod/mode.c

@@ -935,7 +935,7 @@ static memberlist *assert_ismember(struct chanset_t *chan, const char *nick)
 
       simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userhost);
       m->user = get_user_by_host(s);
-      if (!m->user && doresolv(chan) && m->userip[0]) {
+      if (!m->user && m->userip[0]) {
         simple_snprintf(s, sizeof(s), "%s!%s", m->nick, m->userip);
         m->user = get_user_by_host(s);
       }