* Backed out r7276 through r7278. This is too large a change to make during a featur...

diff --git a/citadel/citadel.h b/citadel/citadel.h
index fa979d0939f4ac15e5c27b14d72471bfaec64f37..5751624e7c54154b4ae0eed7e18efddfae64a527 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -38,9 +38,9 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      744             /* This version */
+#define REV_LEVEL      743             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
-#define EXPORT_REV_MIN 744             /* Oldest compatible export files */
+#define EXPORT_REV_MIN 737             /* Oldest compatible export files */
 #define LIBCITADEL_MIN 743             /* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0                  /* zero for stock Citadel; other developers please

diff --git a/citadel/control.c b/citadel/control.c
index 07edd88baf386e9b8fa9f091751be8b261648667..03ffa7c75d09917455cd31fdf42cf427ba146414 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -389,7 +389,6 @@ void cmd_conf(char *argbuf)
                cprintf("%ld\n", config.c_pop3_fetch);
                cprintf("%ld\n", config.c_pop3_fastest);
                cprintf("%d\n", config.c_spam_flag_only);
-               cprintf("%d\n", config.c_xmpps_c2s_port);
                cprintf("000\n");
        }
 
@@ -646,9 +645,6 @@ void cmd_conf(char *argbuf)
                        case 66:
                                config.c_spam_flag_only = atoi(buf);
                                break;
-                       case 67:
-                               config.c_xmpps_c2s_port = atoi(buf);
-                               break;
                        }
                        ++a;
                }

diff --git a/citadel/include/dtds/config-defs.h b/citadel/include/dtds/config-defs.h
index 71f6096088dbad094cd82baa1910970462943942..d14b3b4f49b242b46939fdb998313754ac6a6cbc 100644 (file)
--- a/citadel/include/dtds/config-defs.h
+++ b/citadel/include/dtds/config-defs.h
@@ -89,4 +89,3 @@ CFG_VALUE(INTEGER(c_xmpp_s2s_port),           " XMPP server-to-server port (usually 5269)
 CFG_VALUE(TIME(c_pop3_fetch),          " How often to fetch POP3 messages");
 CFG_VALUE(TIME(c_pop3_fastest),                " Users can specify POP3 fetching this often");
 CFG_VALUE(INTEGER(c_spam_flag_only),   " 1 = flag instead of reject spam");
-CFG_VALUE(INTEGER(c_xmpps_c2s_port),           " XMPP client-to-server SSL port (usually 5223)");

diff --git a/citadel/modules/jabber/serv_xmpp.c b/citadel/modules/jabber/serv_xmpp.c
index c6fc94731b61d342a3c647eece8a55b97158096e..314ecbaa166ae4eb503e913c1d4d8a45e6da1f0b 100644 (file)
--- a/citadel/modules/jabber/serv_xmpp.c
+++ b/citadel/modules/jabber/serv_xmpp.c
@@ -424,18 +424,6 @@ void xmpp_greeting(void) {
 }
 
 
-/*
- * Here's where our XMPPs session begins its happy day.
- */
-void xmpps_greeting(void) {
-       CtdlModuleStartCryptoMsgs(NULL, NULL, NULL);
-#ifdef HAVE_OPENSSL
-       if (!CC->redirect_ssl) CC->kill_me = 1;         /* kill session if no crypto */
-#endif
-       xmpp_greeting();
-}
-
-
 /* 
  * Main command loop for XMPP sessions.
  */
@@ -484,7 +472,6 @@ void xmpp_logout_hook(void) {
 
 
 const char *CitadelServiceXMPP="XMPP";
-const char *CitadelServiceXMPPs="XMPPs";
 
 CTDL_MODULE_INIT(jabber)
 {
@@ -500,21 +487,6 @@ CTDL_MODULE_INIT(jabber)
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
                 CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
                 CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
-
-#ifdef HAVE_OPENSSL
-               CtdlRegisterServiceHook(config.c_xmpps_c2s_port,
-                                       NULL,
-                                       xmpps_greeting,
-                                       xmpp_command_loop,
-                                       xmpp_async_loop,
-                                       CitadelServiceXMPPs);
-#endif
-
-               CtdlRegisterSessionHook(xmpp_cleanup_function, EVT_STOP);
-                CtdlRegisterSessionHook(xmpp_login_hook, EVT_LOGIN);
-                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_LOGOUT);
-                CtdlRegisterSessionHook(xmpp_login_hook, EVT_UNSTEALTH);
-                CtdlRegisterSessionHook(xmpp_logout_hook, EVT_STEALTH);
        }
 
        /* return our Subversion id for the Log */

diff --git a/citadel/setup.c b/citadel/setup.c
index b5ff9e9d51935053681278fcd6b180ea3f9d06a1..05e6eacb1cad17aa975cccdf7034a16e57a6feb7 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1212,7 +1212,7 @@ int main(int argc, char *argv[])
        if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
        if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
        if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
-       if (config.c_xmpps_c2s_port == 0) config.c_xmpps_c2s_port = 5223;
+
        /* Go through a series of dialogs prompting for config info */
        for (curr = 1; curr <= MAXSETUP; ++curr) {
                edit_value(curr);

diff --git a/citadel/tuiconfig.c b/citadel/tuiconfig.c
index 9401b345ea58d571f55292182f87d7bf1a6f67d0..5197abeae8e662f819a03fd42cf5df7b54cc541a 100644 (file)
--- a/citadel/tuiconfig.c
+++ b/citadel/tuiconfig.c
@@ -173,7 +173,6 @@ void do_system_configuration(CtdlIPC *ipc)
        strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
 
        strprompt("XMPP (Jabber) client to server port (-1 to disable)", &sc[62][0], 5);
-       strprompt("XMPP (Jabber) client to server SSL port (-1 to disable)", &sc[67][0], 5);
        /* No prompt because we don't implement this service yet, it's just a placeholder */
        /* strprompt("XMPP (Jabber) server to server port (-1 to disable)", &sc[63][0], 5); */
 

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 6e8a17a0e0205883b947444b43c454d44c551f14..785a54d36a55658846e6015be4ae45acb50fb236 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -116,8 +116,7 @@ CfgMapping ServerConfig[] = {
        {CFG_STR, HKEY("c_xmpp_s2s_port")},
        {CFG_STR, HKEY("c_pop3_fetch")},
        {CFG_STR, HKEY("c_pop3_fastest")},
-       {CFG_YES, HKEY("c_spam_flag_only")},
-       {CFG_STR, HKEY("c_xmpps_c2s_port")}
+       {CFG_YES , HKEY("c_spam_flag_only")}
 };
 
 

diff --git a/webcit/static/t/tab_siteconfig_network.html b/webcit/static/t/tab_siteconfig_network.html
index 49f1649fa6eda5627d27abf051226f967264096b..155d6c7ff6fdff0693c45b8d8a224aa5f2d41eef 100644 (file)
--- a/webcit/static/t/tab_siteconfig_network.html
+++ b/webcit/static/t/tab_siteconfig_network.html
@@ -57,7 +57,4 @@
 <tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
 <input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
 
-<tr><td><?_("XMPP (Jabber) client to server SSL port (-1 to disable)")></td><td>
-<input type="text" name="c_xmpps_c2s_port" maxlength="5" value='<?SERV:CFG("c_xmpps_c2s_port")>'></td></tr>
-
 </table>

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 21cc98451d6a77972d3635da317d9aa1a1ed75a9..3812042992204ffb2485e4ffd16219e5086ca33a 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -113,8 +113,8 @@
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         744             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    744             /* min required Citadel ver */
+#define CLIENT_VERSION         743             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    743             /* min required Citadel ver */
 #define        LIBCITADEL_MIN          743             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
@@ -292,11 +292,7 @@ typedef struct _disp_cal {
        int is_repeat;
 } disp_cal;                                            
 
-typedef struct _ical_map {
-       const char *Name;
-       long NameLen;
-       long eenum;
-} IcalEnumMap;
+
 
 /*
  * Address book entry (keep it short and sweet, it's just a quickie lookup