#include "numeric.h"
#include "logger.h"
#include "send.h"
-#include "s_gline.h"
#include "reject.h"
#include "cache.h"
#include "blacklist.h"
+#include "sslproc.h"
struct config_server_hide ConfigServerHide;
add_reject(client_p, aconf->user, aconf->host);
return (BANNED_CLIENT);
}
- else if(aconf->status & CONF_GLINE)
- {
- sendto_one_notice(client_p, ":*** G-lined");
-
- if(ConfigFileEntry.kline_with_reason)
- sendto_one(client_p,
- form_str(ERR_YOUREBANNEDCREEP),
- me.name, client_p->name, aconf->passwd);
-
- add_reject(client_p, aconf->user, aconf->host);
- return (BANNED_CLIENT);
- }
return NOT_AUTHORISED;
}
ConfigFileEntry.fname_operlog = NULL;
ConfigFileEntry.fname_foperlog = NULL;
ConfigFileEntry.fname_serverlog = NULL;
- ConfigFileEntry.fname_glinelog = NULL;
ConfigFileEntry.fname_klinelog = NULL;
ConfigFileEntry.fname_operspylog = NULL;
ConfigFileEntry.fname_ioerrorlog = NULL;
- ConfigFileEntry.glines = NO;
ConfigFileEntry.use_egd = NO;
- ConfigFileEntry.gline_time = 12 * 3600;
- ConfigFileEntry.gline_min_cidr = 16;
- ConfigFileEntry.gline_min_cidr6 = 48;
ConfigFileEntry.hide_spoof_ips = YES;
ConfigFileEntry.hide_error_messages = 1;
ConfigFileEntry.dots_in_ident = 0;
if(ServerInfo.network_desc == NULL)
ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT);
+ if(ServerInfo.ssld_count < 1)\r
+ ServerInfo.ssld_count = 1;
+
+ if(!rb_setup_ssl_server(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params))\r
+ {\r
+ ilog(L_MAIN, "WARNING: Unable to setup SSL.");\r
+ ssl_ok = 0;\r
+ } else {\r
+ ssl_ok = 1;\r
+ send_new_ssl_certs(ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);\r
+ }\r
+\r
+ if(ServerInfo.ssld_count > get_ssld_count())\r
+ {\r
+ int start = ServerInfo.ssld_count - get_ssld_count();\r
+ /* start up additional ssld if needed */\r
+ start_ssldaemon(start, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);\r
+ \r
+ }
+
if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) ||
(ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
rb_free(ServerInfo.network_desc);
ServerInfo.network_desc = NULL;
+ ServerInfo.ssld_count = 1;
+
/* clean out AdminInfo */
rb_free(AdminInfo.name);
AdminInfo.name = NULL;
rb_snprintf(buffer, sizeof(buffer),
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
user, host, reason, oper_reason, current_date,
- get_oper_name(source_p), rb_current_time());
+ get_oper_name(source_p), (long int)rb_current_time());
}
else if(type == DLINE_TYPE)
{
rb_snprintf(buffer, sizeof(buffer),
"\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
- reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time());
+ reason, oper_reason, current_date, get_oper_name(source_p), (long int)rb_current_time());
}
else if(type == RESV_TYPE)
{
rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
- host, reason, get_oper_name(source_p), rb_current_time());
+ host, reason, get_oper_name(source_p), (long int)rb_current_time());
}
if(fputs(buffer, out) == -1)