remove RB_IPV6

[solanum.git] / modules / m_whois.c

diff --git a/modules/m_whois.c b/modules/m_whois.c
index a43b9109dc8022c81f5591edefa34a3feef0ba44..594656ee7cae292055688ea187567a71cad4fdc4 100644 (file)
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -233,9 +233,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
        int tlen;
        hook_data_client hdata;
        int extra_space = 0;
-#ifdef RB_IPV6
        struct sockaddr_in ip4;
-#endif
 
        if(target_p->user == NULL)
        {
@@ -320,7 +318,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                    GlobalSetOptions.operstring));
        }
 
-       if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p))
+       if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(target_p) && IsOper(source_p))
        {
                char buf[512];
                snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
@@ -364,7 +362,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                           form_str(RPL_WHOISACTUALLY),
                                           target_p->name, target_p->sockhost);
 
-#ifdef RB_IPV6
                if (GET_SS_FAMILY(&target_p->localClient->ip) == AF_INET6 &&
                                (show_ip(source_p, target_p) ||
                                 (source_p == target_p && !IsIPSpoof(target_p))) &&
@@ -376,7 +373,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                                        "%s :Underlying IPv4 is %s",
                                        target_p->name, buf);
                }
-#endif /* RB_IPV6 */
 
                sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
                                   target_p->name,