Network: Remove large parts of deprecated legacy code (#6404)

[dragonfireclient.git] / src / clientiface.cpp

diff --git a/src/clientiface.cpp b/src/clientiface.cpp
index 585c1cdc61f7ab05622dc86149e14422452d0bb3..bb740d9f35469a0e6de7d2bfa8028e7799f94186 100644 (file)
--- a/src/clientiface.cpp
+++ b/src/clientiface.cpp
@@ -66,9 +66,6 @@ void RemoteClient::GetNextBlocks (
                float dtime,
                std::vector<PrioritySortedBlockTransfer> &dest)
 {
-       DSTACK(FUNCTION_NAME);
-
-
        // Increment timers
        m_nothing_to_send_pause_timer -= dtime;
        m_nearest_unsent_reset_timer += dtime;
@@ -457,8 +454,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                {
                case CSE_AuthAccept:
                        m_state = CS_AwaitingInit2;
-                       if ((chosen_mech == AUTH_MECHANISM_SRP)
-                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                       if (chosen_mech == AUTH_MECHANISM_SRP)
                                srp_verifier_delete((SRPVerifier *) auth_data);
                        chosen_mech = AUTH_MECHANISM_NONE;
                        break;
@@ -467,8 +463,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                        break;
                case CSE_SetDenied:
                        m_state = CS_Denied;
-                       if ((chosen_mech == AUTH_MECHANISM_SRP)
-                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                       if (chosen_mech == AUTH_MECHANISM_SRP)
                                srp_verifier_delete((SRPVerifier *) auth_data);
                        chosen_mech = AUTH_MECHANISM_NONE;
                        break;
@@ -546,8 +541,7 @@ void RemoteClient::notifyEvent(ClientStateEvent event)
                        break;
                case CSE_SudoSuccess:
                        m_state = CS_SudoMode;
-                       if ((chosen_mech == AUTH_MECHANISM_SRP)
-                                       || (chosen_mech == AUTH_MECHANISM_LEGACY_PASSWORD))
+                       if (chosen_mech == AUTH_MECHANISM_SRP)
                                srp_verifier_delete((SRPVerifier *) auth_data);
                        chosen_mech = AUTH_MECHANISM_NONE;
                        break;