Clean this up so it's comprehensible.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9764 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index 69b1a00797f25e977e29c7f17942fcb59d6a30bd..3bbaa359e84bde36157d00eaa666e5dd88842cfa 100644 (file)
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -144,28 +144,38 @@ class ModuleOperSSLCert : public Module
                                FingerPrint = cf->ReadValue("oper", "fingerprint", i);
                                SSLOnly = cf->ReadFlag("oper", "sslonly", i);
 
-                               if (SSLOnly || !FingerPrint.empty())
+                               if (FingerPrint.empty() && !SSLOnly)
+                                       continue;
+
+                               if (LoginName != parameters[0])
+                                       continue;
+
+                               if (!OneOfMatches(TheHost, TheIP, HostName.c_str()))
+                                       continue;
+
+                               if (Password.length() && !ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str()))
+                                       continue;
+
+                               if (SSLOnly && !user->GetExt("ssl", dummy))
                                {
-                                       if ((!strcmp(LoginName.c_str(),parameters[0].c_str())) && (!ServerInstance->PassCompare(user, Password.c_str(),parameters[1].c_str(), HashType.c_str())) && (OneOfMatches(TheHost,TheIP,HostName.c_str())))
-                                       {
-                                               if (SSLOnly && !user->GetExt("ssl", dummy))
-                                               {
-                                                       user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
-                                                       return 1;
-                                               }
-
-                                               /* This oper would match */
-                                               if ((!cert) || (cert->GetFingerprint() != FingerPrint))
-                                               {
-                                                       user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
-                                                       ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
-                                                       ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick.c_str(), user->ident.c_str(), user->host);
-                                                       return 1;
-                                               }
-                                       }
+                                       user->WriteNumeric(491, "%s :This oper login name requires an SSL connection.", user->nick.c_str());
+                                       return 1;
+                               }
+
+                               /*
+                                * No cert found or the fingerprint doesn't match
+                                */
+                               if ((!cert) || (cert->GetFingerprint() != FingerPrint))
+                               {
+                                       user->WriteNumeric(491, "%s :This oper login name requires a matching key fingerprint.",user->nick.c_str());
+                                       ServerInstance->SNO->WriteToSnoMask('o',"'%s' cannot oper, does not match fingerprint", user->nick.c_str());
+                                       ServerInstance->Logs->Log("m_ssl_oper_cert",DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: credentials valid, but wrong fingerprint.",user->nick.c_str(), user->ident.c_str(), user->host);
+                                       return 1;
                                }
                        }
                }
+
+               // Let core handle it for extra stuff
                return 0;
        }