Don't #include client.h when conn.h/conn-func.h is already included

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 7d7bb884ba95349749bbfce947fba996908481c8..0a50e9fdbc45a903d1672c7a4d5c34affb46a953 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -25,9 +25,7 @@
 #include "ngircd.h"
 #include "conn-func.h"
 #include "conn-zip.h"
-#include "client.h"
 #include "channel.h"
-#include "resolve.h"
 #include "conf.h"
 #include "defines.h"
 #include "log.h"
@@ -993,6 +991,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
        }
 
+       /* Connected using SSL? */
+       if (Conn_UsesSSL(Client_Conn(c))) {
+               if (!IRC_WriteStrClient
+                   (from, RPL_WHOISSSL_MSG, Client_ID(from), Client_ID(c)))
+                       return DISCONNECTED;
+       }
+
        /* Idle and signon time (local clients only!) */
        if (Client_Conn(c) > NONE ) {
                if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG,