vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ssl sync with http://hg.angelforce.ru/charybdis-old

Browse source
This commit is contained in:
Valery Yatsko 2008-04-06 18:52:42 +04:00
parent 715ffadfd9
commit c6d7203732
27 changed files with 1055 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/core/m_server.c
View file

@ -173,6 +173,15 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
return 0;
/* NOT REACHED */
break;
case -5:
sendto_realops_flags(SNO_GENERAL, L_ALL,
"Connection from servername %s requires SSL/TLS but is plaintext",
name);
ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s",
log_client_name(client_p, SHOW_IP));
exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
return 0;
}
if((target_p = find_server(NULL, name)))

16
modules/m_connect.c
View file

@ -97,6 +97,14 @@ mo_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0;
}
if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
{
sendto_one_notice(source_p,
":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
parv[1]);
return 0;
}
/*
* Get port number from user, if given. If not specified,
* use the default form configuration structure. If missing
@ -191,6 +199,14 @@ ms_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0;
}
if(ServerConfSSL(server_p) && (!ssl_ok || !get_ssld_count()))
{
sendto_one_notice(source_p,
":Connect: Server %s is set to use SSL/TLS but SSL/TLS is not configured.",
parv[1]);
return 0;
}
/*
* Get port number from user, if given. If not specified,
* use the default form configuration structure. If missing

2
modules/m_info.c
View file

@ -639,6 +639,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
info_spy(source_p);
SetCork(source_p);
send_info_text(source_p);
send_birthdate_online_time(source_p);
@ -657,7 +658,6 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
if(hunt_server(client_p, source_p, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
{
info_spy(source_p);
send_info_text(source_p);
if(IsOper(source_p))

8
modules/m_whois.c
View file

@ -190,7 +190,10 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
nick++;
}
target_p = find_named_person(nick);
if(MyClient(source_p))
target_p = find_named_person(nick);
else
target_p = find_person(nick);
if(target_p != NULL)
{
@ -347,6 +350,9 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
target_p->name,
rb_current_time() - target_p->localClient->last,
target_p->localClient->firsttime);
sendto_one_notice(source_p, ":%ld %ld", target_p->localClient->last,
target_p->localClient->firsttime);
}
else
{