Revert lightly tested starttls changes for 3.4.0.

diff --git a/include/client.h b/include/client.h
index bb0c0e6613b7e503c20cc3375e387f996da31706..d394103ad6acecc6b2d9042c5a55d37f0d3c74f3 100644 (file)
--- a/include/client.h
+++ b/include/client.h
@@ -447,7 +447,6 @@ struct ListClient
 #define CLICAP_ACCOUNT_NOTIFY  0x0004
 #define CLICAP_EXTENDED_JOIN   0x0008
 #define CLICAP_AWAY_NOTIFY     0x0010
-#define CLICAP_TLS             0x0020
 
 /*
  * flags macros.

diff --git a/include/numeric.h b/include/numeric.h
index 9bdc827ef97ac436842fe95e034db3503aeda9ec..99d402f9b354b1e04b87f3190ccf64e35aa76e93 100644 (file)
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -316,11 +316,8 @@ extern const char *form_str(int);
 
 #define ERR_HELPNOTFOUND     524
 
-#define RPL_STARTTLS         670 /* ircv3.atheme.org tls-3.1 */
 #define RPL_WHOISSECURE      671 /* Unreal3.2 --nenolod */
 
-#define ERR_STARTTLS         691 /* ircv3.atheme.org tls-3.2 */
-
 #define RPL_MODLIST          702
 #define RPL_ENDOFMODLIST     703
 

diff --git a/modules/Makefile.in b/modules/Makefile.in
index a2a36470a4c04796632744f19e46c2e435d67d99..20f6dc6a47b6b29c44fa727491d78c95b31d2050 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -99,7 +99,6 @@ TSRCS =                          \
   m_set.c \
   m_signon.c \
   m_snote.c \
-  m_starttls.c \
   m_stats.c \
   m_svinfo.c \
   m_tb.c \

diff --git a/modules/m_cap.c b/modules/m_cap.c
index 7abfa9fe639f79b01fe36a51d50cf9162d21f13f..81352ab37835463b755a4ce0404dcc8dcd835869 100644 (file)
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -73,7 +73,6 @@ static struct clicap
        _CLICAP("account-notify", CLICAP_ACCOUNT_NOTIFY, 0, 0),
        _CLICAP("extended-join", CLICAP_EXTENDED_JOIN, 0, 0),
        _CLICAP("away-notify", CLICAP_AWAY_NOTIFY, 0, 0),
-       _CLICAP("tls", CLICAP_TLS, 0, 0),
 };
 
 #define CLICAP_LIST_LEN (sizeof(clicap_list) / sizeof(struct clicap))

diff --git a/src/messages.tab b/src/messages.tab
index 942f866453ee8fa37c6a9976d4732ad2ec05ddb3..c269771a47957d1eaf5f476283c77273073a524a 100644 (file)
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -695,7 +695,7 @@ static  const char *  replies[] = {
 /* 667 */      NULL,
 /* 668 */      NULL,
 /* 669 */      NULL,
-/* 670 RPL_STARTTLS, */                ":STARTTLS successful, proceed with TLS handshake",
+/* 670 */      NULL,
 /* 671 RPL_WHOISSECURE, */     "%s :is using a secure connection",
 /* 672 */      NULL,
 /* 673 */      NULL,
@@ -716,7 +716,7 @@ static  const char *  replies[] = {
 /* 688 */      NULL,
 /* 689 */      NULL,
 /* 690 */      NULL,
-/* 691 ERR_STARTTLS */         ":%s",
+/* 691 */      NULL,
 /* 692 */      NULL,
 /* 693 */      NULL,
 /* 694 */      NULL,