From d38dcbfe747f7cf48a024187038aef3afe662aeb Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 9 Nov 2012 20:11:58 +0000 Subject: - Finish stabilizing/cleanup of conf parser git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1647 82007160-df01-0410-b94d-b575c5fd34c7 --- src/conf.c | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'src/conf.c') diff --git a/src/conf.c b/src/conf.c index 9bb1984..8763885 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1457,18 +1457,11 @@ read_conf(FILE *file) * start DNS lookups of all hostnames in the conf * line and convert an IP addresses in a.b.c.d number for to IP#s. */ -static void +void lookup_confhost(struct MaskItem *conf) { struct addrinfo hints, *res; - if (has_wildcards(conf->host)) - { - ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)", - conf->host, conf->name); - return; - } - /* Do name lookup now on hostnames given and store the * ip numbers in conf structure. */ @@ -1961,40 +1954,6 @@ conf_add_class_to_conf(struct MaskItem *conf, const char *class_name) } } -/* conf_add_server() - * - * inputs - pointer to config item - * - pointer to link count already on this conf - * output - NONE - * side effects - Add a connect block - */ -int -conf_add_server(struct MaskItem *conf, const char *class_name) -{ - conf_add_class_to_conf(conf, class_name); - - if (EmptyString(conf->host) || EmptyString(conf->name)) - { - sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, - "Bad connect block"); - ilog(LOG_TYPE_IRCD, "Bad connect block"); - return -1; - } - - if (EmptyString(conf->passwd)) - { - sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, - "Bad connect block, name %s", - conf->name); - ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name); - return -1; - } - - lookup_confhost(conf); - - return 0; -} - /* yyerror() * * inputs - message from parser -- cgit