X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/3abc337fe1ef89bfe5539fe60e441ece2fd4be8e..bfc44622c8d3c9b94e89ee169e0e04d61adcc098:/modules/m_starttls.c

diff --git a/modules/m_starttls.c b/modules/m_starttls.c
index 5d87f0b8..67f31d15 100644
--- a/modules/m_starttls.c
+++ b/modules/m_starttls.c
@@ -33,9 +33,10 @@
 #include "s_serv.h"
 #include "logger.h"
 
-static int mr_starttls(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static const char starttls_desc[] = "Provides the tls CAP and STARTTLS command";
 
+static void mr_starttls(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
 struct Message starttls_msgtab = {
 	"STARTTLS", 0, 0, 0, 0,
 	{{mr_starttls, 0}, mg_ignore, mg_ignore, mg_ignore, mg_ignore, mg_ignore}
@@ -45,26 +46,20 @@ mapi_clist_av1 starttls_clist[] = { &starttls_msgtab, NULL };
 
 unsigned int CLICAP_TLS = 0;
 
-static int
-_modinit(void)
-{
 #ifdef HAVE_LIBCRYPTO
-	CLICAP_TLS = capability_put(cli_capindex, "tls", NULL);
-#endif
-	return 0;
-}
+mapi_cap_list_av2 starttls_cap_list[] = {
+	{ MAPI_CAP_CLIENT, "tls", NULL, &CLICAP_TLS },
+	{ 0, NULL, NULL, NULL }
+};
+#else /* HAVE_LIBCRYPTO */
 
-static void
-_moddeinit(void)
-{
-#ifdef HAVE_LIBCRYPTO
-	capability_orphan(cli_capindex, "tls");
-#endif
-}
+mapi_cap_list_av2 starttls_cap_list[] = { { 0, NULL, NULL, NULL } };
+
+#endif /* HAVE_LIBCRYPTO */
 
-DECLARE_MODULE_AV2(starttls, _modinit, _moddeinit, starttls_clist, NULL, NULL, NULL, NULL, starttls_desc);
+DECLARE_MODULE_AV2(starttls, NULL, NULL, starttls_clist, NULL, NULL, starttls_cap_list, NULL, starttls_desc);
 
-static int
+static void
 mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 #ifdef HAVE_LIBCRYPTO
@@ -72,25 +67,25 @@ mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
 	rb_fde_t *F[2];
 
 	if (!MyConnect(client_p))
-		return 0;
+		return;
 
 	if (IsSSL(client_p))
 	{
 		sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "Nested TLS handshake not allowed");
-		return 1;
+		return;
 	}
 
-	if (!ssl_ok || !get_ssld_count())
+	if (!ircd_ssl_ok || !get_ssld_count())
 	{
 		sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
-		return 1;
+		return;
 	}
 
 	if (rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &F[0], &F[1], "STARTTLS ssld session") == -1)
 	{
 		ilog_error("error creating SSL/TLS socketpair for ssld slave");
 		sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "Unable to create SSL/TLS socketpair for ssld offload slave");
-		return 1;
+		return;
 	}
 
 	s_assert(client_p->localClient != NULL);
@@ -108,11 +103,7 @@ mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
 		client_p->localClient->ssl_ctl = ctl;
 		SetSSL(client_p);
 	}
-	else
-		return 1;
-
-#else
+#else /* HAVE_LIBCRYPTO */
 	sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
-#endif
-	return 0;
+#endif /* HAVE_LIBCRYPTO */
 }