Remove all the DEFINE's and the random places they were used for the .conf-based ban stuff.

This commit is contained in:
JD Horelick 2010-12-04 17:26:14 -05:00
parent 56c1612ff3
commit f26e8b67e2
4 changed files with 1 additions and 28 deletions

View file

@ -62,10 +62,6 @@
#define SPATH BINPATH "/ircd" /* ircd executable */ #define SPATH BINPATH "/ircd" /* ircd executable */
#define LIPATH LIBPATH "/libircd" SHARED_SUFFIX /* ircd library */ #define LIPATH LIBPATH "/libircd" SHARED_SUFFIX /* ircd library */
#define CPATH ETCPATH "/ircd.conf" /* ircd.conf file */ #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 RPATH ETCPATH "/ircd.rsa" /* ircd rsa private keyfile */
#define MPATH ETCPATH "/ircd.motd" /* MOTD file */ #define MPATH ETCPATH "/ircd.motd" /* MOTD file */
#define LPATH LOGPATH "/ircd.log" /* ircd logfile */ #define LPATH LOGPATH "/ircd.log" /* ircd logfile */

View file

@ -52,18 +52,6 @@ Info MyInformation[] = {
{"DPATH", "NONE", 0, "Directory Containing Configuration Files"}, {"DPATH", "NONE", 0, "Directory Containing Configuration Files"},
#endif /* DPATH */ #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 #ifdef HPATH
{"HPATH", HPATH, 0, "Path to Operator Help Files"}, {"HPATH", HPATH, 0, "Path to Operator Help Files"},
#else #else
@ -96,12 +84,6 @@ Info MyInformation[] = {
{"KILLCHASETIMELIMIT", "", KILLCHASETIMELIMIT, {"KILLCHASETIMELIMIT", "", KILLCHASETIMELIMIT,
"Nick Change Tracker for KILL"}, "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 #ifdef LPATH
{"LPATH", LPATH, 0, "Path to Log File"}, {"LPATH", LPATH, 0, "Path to Log File"},
#else #else

View file

@ -100,7 +100,6 @@ install: install-mkdirs build
fi; \ fi; \
$(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \ $(INSTALL_BIN) $$i $(DESTDIR)$(bindir); \
done; \ 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)/vimotd
$(LN) $(DESTDIR)$(bindir)/viconf $(DESTDIR)$(bindir)/viklines

View file

@ -44,10 +44,6 @@ int main(int argc, char *argv[])
p = argv[0]; p = argv[0];
else else
p++; p++;
#ifdef KPATH
if(strcmp(p, "viklines") == 0)
filename = KPATH;
#endif /* KPATH */
if(strcmp(p, "vimotd") == 0) if(strcmp(p, "vimotd") == 0)
filename = MPATH; filename = MPATH;