Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / s_conf.c

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index f4dde532464f939c5010f81f9855cca6a6d39d7a..539a114a210c60d3ad248be125a507cced2a0743 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -826,6 +826,7 @@ int read_configuration_file(void)
 {
   conf_error = 0;
   feature_unmark(); /* unmark all features for resetting later */
+  clear_nameservers(); /* clear previous list of DNS servers */
   /* Now just open an fd. The buffering isn't really needed... */
   init_lexer();
   yyparse();
@@ -1084,7 +1085,7 @@ int find_kill(struct Client *cptr)
     return -1;
   }
 
-  if ((agline = gline_lookup(cptr, 0))) {
+  if (!feature_bool(FEAT_DISABLE_GLINES) && (agline = gline_lookup(cptr, 0))) {
     /*
      * find active glines
      * added a check against the user's IP address to find_gline() -Kev