- m_version.c: removed confopts(). Configuration options can be seen in /info

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2121 82007160-df01-0410-b94d-b575c5fd34c7

2 files changed, 4 insertions, 41 deletions

diff --git a/modules/m_version.c b/modules/m_version.c
index b534c0f..d9e689a 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -36,7 +36,6 @@
 
 /* Option string. */
 static const char serveropts[] = {
-  ' ',
   'T',
   'S',
 #ifdef TS_CURRENT
@@ -49,42 +48,6 @@ static const char serveropts[] = {
   '\0'
 };
 
-/* confopts()
- *
- * input  - client pointer
- * output - ircd.conf option string
- * side effects - none
- */
-static char *
-confopts(struct Client *source_p)
-{
-  static char result[12];
-  char *p = result;
-
-  *p++ = 'e'; /* excepts */
-
-  if (ConfigFileEntry.glines)
-    *p++ = 'G';
-  *p++ = 'g';
-
-  /* might wanna hide this :P */
-  if (ServerInfo.hub &&
-      (!ConfigFileEntry.disable_remote || HasUMode(source_p, UMODE_OPER)))
-    *p++ = 'H';
-
-  *p++ = 'I'; /* invex */
-  *p++ = 'K'; /* knock */
-  *p++ = 'M';
-
-  if (ConfigFileEntry.ignore_bogus_ts)
-    *p++ = 'T';
-  *p++ = '6';
-
-  *p = '\0';
-
-  return result;
-}
-
 /*
  * m_version - VERSION command handler
  *      parv[0] = sender prefix
@@ -113,7 +76,7 @@ m_version(struct Client *client_p, struct Client *source_p,
 
   sendto_one(source_p, form_str(RPL_VERSION), me.name,
              source_p->name, ircd_version, serno,
-             me.name, confopts(source_p), serveropts);
+             me.name, serveropts);
   show_isupport(source_p);
 }
 
@@ -133,7 +96,7 @@ mo_version(struct Client *client_p, struct Client *source_p,
 
   sendto_one(source_p, form_str(RPL_VERSION), me.name,
              source_p->name, ircd_version, serno,
-             me.name, confopts(source_p), serveropts);
+             me.name, serveropts);
   show_isupport(source_p);
 }
 
@@ -154,7 +117,7 @@ ms_version(struct Client *client_p, struct Client *source_p,
              ID_or_name(&me, client_p),
              ID_or_name(source_p, client_p),
              ircd_version, serno,
-             me.name, confopts(source_p), serveropts);
+             me.name, serveropts);
   show_isupport(source_p);
 }
 
diff --git a/src/numeric.c b/src/numeric.c
index 90842dd..5f15738 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -378,7 +378,7 @@ static const char *replies[] = {
 /* 348 RPL_EXCEPTLIST */ ":%s 348 %s %s %s!%s@%s %s %lu",
 /* 349 RPL_ENDOFEXCEPTLIST */ ":%s 349 %s %s :End of Channel Exception List",
 /* 350 */ NULL,
-/* 351 RPL_VERSION */ ":%s 351 %s %s(%s). %s :%s%s",
+/* 351 RPL_VERSION */ ":%s 351 %s %s(%s). %s :%s",
 /* 352 RPL_WHOREPLY */ ":%s 352 %s %s %s %s %s %s %s :%d %s",
 /* 353 RPL_NAMREPLY */ ":%s 353 %s %s %s :",
 /* 354 */ NULL,