SASL SCRAM: renamed scram_free_session to scram_session_free

This commit is contained in:
Patrick Okraku 2023-11-12 12:45:08 +01:00 committed by Patrick
parent c82ad32171
commit 681a88d6df
4 changed files with 7 additions and 7 deletions

View File

@ -2012,7 +2012,7 @@ scram_authenticate (server *serv, const char *data, const char *digest,
{
// Authentication succeeded
tcp_sendf (serv, "AUTHENTICATE +\r\n");
g_clear_pointer (&serv->scram_session, scram_free_session);
g_clear_pointer (&serv->scram_session, scram_session_free);
}
else if (status == SCRAM_ERROR)
{
@ -2025,7 +2025,7 @@ scram_authenticate (server *serv, const char *data, const char *digest,
g_info ("SASL SCRAM authentication failed: %s", serv->scram_session->error);
}
g_clear_pointer (&serv->scram_session, scram_free_session);
g_clear_pointer (&serv->scram_session, scram_session_free);
}
}
#endif
@ -2076,7 +2076,7 @@ void
inbound_sasl_error (server *serv)
{
#ifdef USE_OPENSSL
g_clear_pointer (&serv->scram_session, scram_free_session);
g_clear_pointer (&serv->scram_session, scram_session_free);
#endif
/* Just abort, not much we can do */
tcp_sendf (serv, "AUTHENTICATE *\r\n");

View File

@ -59,7 +59,7 @@ scram_session
}
void
scram_free_session (scram_session *session)
scram_session_free (scram_session *session)
{
if (session == NULL)
{

View File

@ -44,7 +44,7 @@ typedef enum
} scram_status;
scram_session *scram_session_create (const char *digset, const char *username, const char *password);
void scram_free_session (scram_session *session);
void scram_session_free (scram_session *session);
scram_status scram_process (scram_session *session, const char *input, char **output, size_t *output_len);
#endif

View File

@ -1766,7 +1766,7 @@ server_set_defaults (server *serv)
g_free (serv->nick_prefixes);
g_free (serv->nick_modes);
#ifdef USE_OPENSSL
g_clear_pointer (&serv->scram_session, scram_free_session);
g_clear_pointer (&serv->scram_session, scram_session_free);
#endif
serv->chantypes = g_strdup ("#&!+");
serv->chanmodes = g_strdup ("beI,k,l");
@ -1940,7 +1940,7 @@ server_free (server *serv)
if (serv->ctx)
_SSL_context_free (serv->ctx);
g_clear_pointer (&serv->scram_session, scram_free_session);
g_clear_pointer (&serv->scram_session, scram_session_free);
#endif
fe_server_callback (serv);