From f26e8b67e20ed4502a3402aa4edd3a743f9bac41 Mon Sep 17 00:00:00 2001
From: JD Horelick <jdhore1@gmail.com>
Date: Sat, 4 Dec 2010 17:26:14 -0500
Subject: [PATCH] Remove all the DEFINE's and the random places they were used
 for the .conf-based ban stuff.

---
 include/config.h.dist |  4 ----
 include/m_info.h      | 18 ------------------
 tools/Makefile.in     |  3 +--
 tools/viconf.c        |  4 ----
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/include/config.h.dist b/include/config.h.dist
index 04fcfdb1..9baeabe4 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -62,10 +62,6 @@
 #define SPATH    BINPATH "/ircd"		   /* ircd executable */
 #define LIPATH   LIBPATH "/libircd" SHARED_SUFFIX  /* ircd library */
 #define CPATH    ETCPATH "/ircd.conf"		   /* ircd.conf file */
-#define KPATH    ETCPATH "/kline.conf"		   /* kline file */
-#define DLPATH   ETCPATH "/dline.conf"		   /* dline file */
-#define XPATH	 ETCPATH "/xline.conf"		   /* xline file */
-#define RESVPATH ETCPATH "/resv.conf"		   /* resv file */
 #define RPATH    ETCPATH "/ircd.rsa"		   /* ircd rsa private keyfile */
 #define MPATH    ETCPATH "/ircd.motd"		   /* MOTD file */
 #define LPATH    LOGPATH "/ircd.log"		   /* ircd logfile */
diff --git a/include/m_info.h b/include/m_info.h
index b2670143..fd255573 100644
--- a/include/m_info.h
+++ b/include/m_info.h
@@ -52,18 +52,6 @@ Info MyInformation[] = {
 	{"DPATH", "NONE", 0, "Directory Containing Configuration Files"},
 #endif /* DPATH */
 
-#ifdef DLPATH
-	{"DLPATH", DLPATH, 0, "Path to D-line File"},
-#else
-	{"DLPATH", "NONE", 0, "Path to D-line File"},
-#endif /* DLPATH */
-
-#ifdef RESVPATH
-	{"RESVPATH", RESVPATH, 0, "Path to resv file"},
-#else
-	{"RESVPATH", "NONE", 0, "Path to resv file"},
-#endif
-
 #ifdef HPATH
 	{"HPATH", HPATH, 0, "Path to Operator Help Files"},
 #else
@@ -96,12 +84,6 @@ Info MyInformation[] = {
 	{"KILLCHASETIMELIMIT", "", KILLCHASETIMELIMIT,
 	 "Nick Change Tracker for KILL"},
 
-#ifdef KPATH
-	{"KPATH", KPATH, 0, "Path to K-line File"},
-#else
-	{"KPATH", "NONE", 0, "Path to K-line File"},
-#endif /* KPATH */
-
 #ifdef LPATH
 	{"LPATH", LPATH, 0, "Path to Log File"},
 #else
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3ed0073b..76ce4b86 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -100,7 +100,6 @@ install: install-mkdirs build
 		fi; \
 		$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
 	done; \
-	$(RM) -f $(DESTDIR)$(bindir)/vimotd $(DESTDIR)$(bindir)/viklines
+	$(RM) -f $(DESTDIR)$(bindir)/vimotd
 	$(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/vimotd
-	$(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/viklines
 
diff --git a/tools/viconf.c b/tools/viconf.c
index d716d511..0f2022f6 100644
--- a/tools/viconf.c
+++ b/tools/viconf.c
@@ -44,10 +44,6 @@ int main(int argc, char *argv[])
     p = argv[0];
   else
     p++;
-#ifdef KPATH
-  if(strcmp(p, "viklines") == 0)
-    filename = KPATH;
-#endif /* KPATH */
 
   if(strcmp(p, "vimotd") == 0)
     filename = MPATH;