Merge branch 'release/1.6.19'

oftc · May 6, 2015 · 23a2db7 · 23a2db7
2 parents b110ee0 + d459418
commit 23a2db7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/include/patchlevel.h b/include/patchlevel.h
@@ -23,5 +23,5 @@
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL   "hybrid-7.2.2+oftc1.6.18"
+#define PATCHLEVEL   "hybrid-7.2.2+oftc1.6.19"
 #endif
diff --git a/src/messages.tab b/src/messages.tab
@@ -27,7 +27,7 @@ static struct NumericInfo replies[] = {
 #ifdef HALFOPS
 /* 004 */  {"RPL_MYINFO", ":%s 004 %s %s %s %s biklmnopstveIh bkloveIh", NULL},
 #else
-/* 004 */  {"RPL_MYINFO", ":%s 004 %s %s %s %s biklmnopstveI bkloveI", NULL},
+/* 004 */  {"RPL_MYINFO", ":%s 004 %s %s %s %s bciklmnopstvzeIMRS bkloveI", NULL},
 #endif
 /* 005 */  {"RPL_ISUPPORT", ":%s 005 %s %s :are supported by this server", NULL},
 /* 006 */  {NULL, NULL, NULL},

diff --git a/src/s_conf.c b/src/s_conf.c
@@ -2620,7 +2620,7 @@ read_conf_files(int cold)
   add_isupport("CHANLIMIT", chanlimit, -1);
   ircsprintf(chanmodes, "%s%s%s%s", ConfigChannel.use_except ? "e" : "",
        ConfigChannel.use_invex ? "I" : "", ConfigChannel.use_quiet ? "q" : "",
-       "b,k,l,imnpstMRS");
+       "b,k,l,cimnpstzMRS");
   add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
   if (ConfigChannel.use_except)
     add_isupport("EXCEPTS", "e", -1);

diff --git a/src/s_misc.c b/src/s_misc.c
@@ -138,33 +138,13 @@ small_file_date(time_t lclock)
 char *
 ssl_get_cipher(SSL *ssl)
 {
-  static char buffer[128];
-  const char *name = NULL;
-  int bits;
-
-  switch (ssl->session->ssl_version)
-  {
-    case SSL2_VERSION:
-      name = "SSLv2";
-      break;
-
-    case SSL3_VERSION:
-      name = "SSLv3";
-      break;
-
-    case TLS1_VERSION:
-      name = "TLSv1";
-      break;
-
-    default:
-      name = "UNKNOWN";
-  }
+  static char buffer[IRCD_BUFSIZE];
+  int bits = 0;
 
   SSL_CIPHER_get_bits(SSL_get_current_cipher(ssl), &bits);
 
-  snprintf(buffer, sizeof(buffer), "%s %s-%d",
-           name, SSL_get_cipher(ssl), bits);
-
+  snprintf(buffer, sizeof(buffer), "%s %s-%d", SSL_get_version(ssl),
+           SSL_get_cipher(ssl), bits);
   return buffer;
 }
 #endif