9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

starttls: Explicitly reject starttls if TLS is not configured or not compiled in.

Browse source
This commit is contained in:
Jilles Tjoelker 2012-11-03 15:50:43 +01:00
parent c1cddb36c0
commit 8ff07125c3
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/m_starttls.c
View file

@ -51,6 +51,12 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
if (!MyConnect(client_p)) if (!MyConnect(client_p))
return 0; return 0;
if (!ssl_ok || !get_ssld_count())
{
sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
return 1;
}
if (rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &F[0], &F[1], "STARTTLS ssld session") == -1) 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"); ilog_error("error creating SSL/TLS socketpair for ssld slave");
@ -79,5 +85,6 @@ mr_starttls(struct Client *client_p, struct Client *source_p, int parc, const ch
return 1; return 1;
#endif #endif
sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
return 0; return 0;
} }