summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/inbound.c6
-rw-r--r--src/common/scram.c2
-rw-r--r--src/common/scram.h2
-rw-r--r--src/common/server.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/common/inbound.c b/src/common/inbound.c
index e8cfd0b5..fdee2ecc 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -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");
diff --git a/src/common/scram.c b/src/common/scram.c
index b9f2beb0..b39199de 100644
--- a/src/common/scram.c
+++ b/src/common/scram.c
@@ -59,7 +59,7 @@ scram_session
 }
 
 void
-scram_free_session (scram_session *session)
+scram_session_free (scram_session *session)
 {
 	if (session == NULL)
 	{
diff --git a/src/common/scram.h b/src/common/scram.h
index 68672448..ffe22037 100644
--- a/src/common/scram.h
+++ b/src/common/scram.h
@@ -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
diff --git a/src/common/server.c b/src/common/server.c
index 97f8425d..c78ce900 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -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);