repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 2e168c7809f8c149710a75bf3bf5b98e72217c61:
path_to: 
revision_to: 

commit 2e168c7809f8c149710a75bf3bf5b98e72217c61
Author: Alexander Barton 
Date:   Sun Jan 26 23:41:59 2014 +0100

    Return ISUPPORT(005) numerics on "VERSION"

    This is how ircd-seven, Charybdis, Hybrid, and InspIRCd behave,
    for example.

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c

--- 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
@@ -1106,10 +1106,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(Client))
+		return DISCONNECTED;
+#endif
+
+	return CONNECTED;
 } /* IRC_VERSION */

 /**

-----END OF PAGE-----