Remove imp.h and exp.h header files

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

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index cd5e45c12a28b2d834a326977aab906b610b955c..6a4057292f42820547afb9d3a8ff5b01171eb676 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
  * IRC info commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -43,7 +42,6 @@
 #include "client-cap.h"
 #include "op.h"
 
-#include "exp.h"
 #include "irc-info.h"
 
 /* Local functions */
@@ -1106,10 +1104,19 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        }
 
        /* send version information */
-       return IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
-                                 PACKAGE_NAME, PACKAGE_VERSION,
-                                 NGIRCd_DebugLevel, Conf_ServerName,
-                                 NGIRCd_VersionAddition);
+       if (!IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
+                               PACKAGE_NAME, PACKAGE_VERSION,
+                               NGIRCd_DebugLevel, Conf_ServerName,
+                               NGIRCd_VersionAddition))
+               return DISCONNECTED;
+
+#ifndef STRICT_RFC
+       /* send RPL_ISUPPORT(005) numerics */
+       if (!IRC_Send_ISUPPORT(prefix))
+               return DISCONNECTED;
+#endif
+
+       return CONNECTED;
 } /* IRC_VERSION */
 
 /**