- Initial rewrite of the configuration subsystem

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1632 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 5 insertions, 5 deletions

diff --git a/src/s_gline.c b/src/s_gline.c
index aff7a05..3d563be 100644
--- a/src/s_gline.c
+++ b/src/s_gline.c
@@ -27,8 +27,8 @@
 #include "client.h"
 #include "irc_string.h"
 #include "ircd.h"
-#include "hostmask.h"
 #include "conf.h"
+#include "hostmask.h"
 #include "s_misc.h"
 #include "send.h"
 #include "s_serv.h"
@@ -42,11 +42,11 @@ dlink_list pending_glines[GLINE_PENDING_ADD_TYPE + 1] = { { NULL, NULL, 0 },
 static void expire_pending_glines(struct gline_pending *);
 
 
-struct AccessItem *
+struct MaskItem *
 find_is_glined(const char *host, const char *user)
 {
   struct irc_ssaddr iphost, *piphost;
-  struct AccessItem *aconf;
+  struct MaskItem *conf = NULL;
   int t;
 
   if ((t = parse_netmask(host, &iphost, &t)) != HM_HOST)
@@ -65,8 +65,8 @@ find_is_glined(const char *host, const char *user)
     piphost = NULL;
   }
 
-  aconf = find_conf_by_address(host, piphost, CONF_GLINE, t, user, NULL, 0);
-  return aconf;
+  conf = find_conf_by_address(host, piphost, CONF_GLINE, t, user, NULL, 0);
+  return conf;
 }
 
 /* cleanup_glines()