Set errno properly on GnuTLS sessions that die during the SSL handshake

[user/henk/code/inspircd.git] / src / modules / extra / m_sslinfo.cpp

diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index 6d0c7893742fbb6958246c065422b5eaf8149849..fb1a0066641cfedcd0e1ab2c880a4bfae05414b3 100644 (file)
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,22 +12,17 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "transport.h"
-#include "wildcard.h"
-#include "dns.h"
 
 /* $ModDesc: Provides /sslinfo command used to test who a mask matches */
 /* $ModDep: transport.h */
 
 /** Handle /SSLINFO
  */
-class cmd_sslinfo : public Command
+class CommandSSLInfo : public Command
 {
  public:
-       cmd_sslinfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
+       CommandSSLInfo (InspIRCd* Instance) : Command(Instance,"SSLINFO", 0, 1)
        {
                this->source = "m_sslinfo.so";
                this->syntax = "<nick>";
@@ -44,12 +39,15 @@ class cmd_sslinfo : public Command
                        {
                                if (cert->GetError().length())
                                {
-                                       user->WriteServ("NOTICE %s :*** Error:             %s", user->nick.c_str(), cert->GetError().c_str());
+                                       user->WriteServ("NOTICE %s :*** No SSL certificate information for this user (%s).", user->nick.c_str(), cert->GetError().c_str());
                                }
-                               user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick.c_str(), cert->GetDN().c_str());
-                               user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
-                               user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
-                               return CMD_SUCCESS;
+                               else
+                               {
+                                       user->WriteServ("NOTICE %s :*** Distinguised Name: %s", user->nick.c_str(), cert->GetDN().c_str());
+                                       user->WriteServ("NOTICE %s :*** Issuer:            %s", user->nick.c_str(), cert->GetIssuer().c_str());
+                                       user->WriteServ("NOTICE %s :*** Key Fingerprint:   %s", user->nick.c_str(), cert->GetFingerprint().c_str());
+                               }
+                               return CMD_LOCALONLY;
                        }
                        else
                        {
@@ -58,7 +56,7 @@ class cmd_sslinfo : public Command
                        }
                }
                else
-                       user->WriteNumeric(401, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nickname", user->nick.c_str(), parameters[0].c_str());
 
                return CMD_FAILURE;
        }
@@ -66,13 +64,13 @@ class cmd_sslinfo : public Command
 
 class ModuleSSLInfo : public Module
 {
-       cmd_sslinfo* newcommand;
+       CommandSSLInfo* newcommand;
  public:
        ModuleSSLInfo(InspIRCd* Me)
                : Module(Me)
        {
 
-               newcommand = new cmd_sslinfo(ServerInstance);
+               newcommand = new CommandSSLInfo(ServerInstance);
                ServerInstance->AddCommand(newcommand);
 
        }
@@ -84,7 +82,7 @@ class ModuleSSLInfo : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };