- /info now also shows pathnames of g-/x-line database files

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

3 files changed, 32 insertions, 13 deletions

diff --git a/include/conf.h b/include/conf.h
index 97d5cf8..0c6b56b 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -197,10 +197,10 @@ struct config_file_entry
   const char *dpath;          /* DPATH if set from command line */
   const char *configfile;
   const char *klinefile;
+  const char *glinefile;
   const char *xlinefile;
   const char *dlinefile;
-  const char *cresvfile;
-  const char *nresvfile;
+  const char *resvfile;
 
   char *egdpool_path;
   char *service_name;
diff --git a/modules/m_info.c b/modules/m_info.c
index 2e4d7be..026f687 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -68,25 +68,43 @@ static const struct InfoStruct info_table[] =
     "CPATH",
     OUTPUT_STRING,
     &ConfigFileEntry.configfile,
-    "Path to Main Configuration File"
+    "Path to main configuration file"
   },
   {
     "DPATH",
     OUTPUT_STRING,
     &ConfigFileEntry.dpath,
-    "Directory Containing Configuration Files"
+    "Directory containing configuration files"
   },
   {
     "DLPATH",
     OUTPUT_STRING,
     &ConfigFileEntry.dlinefile,
-    "Path to D-line File"
+    "Path to D-line database file"
   },
   {
     "KPATH",
     OUTPUT_STRING,
     &ConfigFileEntry.klinefile,
-    "Path to K-line File"
+    "Path to K-line database file"
+  },
+  {
+    "GPATH",
+    OUTPUT_STRING,
+    &ConfigFileEntry.glinefile,
+    "Path to G-line database file"
+  },
+  {
+    "XPATH",
+    OUTPUT_STRING,
+    &ConfigFileEntry.xlinefile,
+    "Path to X-line database file"
+  },
+  {
+    "RESVPATH",
+    OUTPUT_STRING,
+    &ConfigFileEntry.xlinefile,
+    "Path to resv database file"
   },
   {
     "network_name",
@@ -278,7 +296,7 @@ static const struct InfoStruct info_table[] =
     "failed_oper_notice",
     OUTPUT_BOOLEAN,
     &ConfigFileEntry.failed_oper_notice,
-    "Inform opers if someone /oper's with the wrong password"
+    "Inform opers if someone tries to /oper with the wrong password"
   },
   {
     "dots_in_ident",
diff --git a/src/ircd.c b/src/ircd.c
index 30e0ea2..7ccd818 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -503,12 +503,13 @@ main(int argc, char *argv[])
   init_chcap_usage_counts();
 
   ConfigFileEntry.dpath      = DPATH;
-  ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
-  ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
-  ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
-  ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
-//  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
-//  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
+  ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
+  ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
+  ConfigFileEntry.klinefile  = GPATH;    /* Server gline file         */
+  ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
+  ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
+  ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
+
   myargv = argv;
   umask(077);                /* better safe than sorry --SRB */