From 605ffeb2eb1b1426bf93a9babc8ca40cd926b6de Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 30 Mar 2009 16:49:04 +0000 Subject: [PATCH] * Backed out r7276 through r7278. This is too large a change to make during a feature freeze; it is the wrong approach; and it also produced crashes and corrupt data on my test system during evaluation (even after a make distclean). We will revisit this after the release. --- citadel/citadel.h | 4 +-- citadel/control.c | 4 --- citadel/include/dtds/config-defs.h | 1 - citadel/modules/jabber/serv_xmpp.c | 28 --------------------- citadel/setup.c | 2 +- citadel/tuiconfig.c | 1 - webcit/siteconfig.c | 3 +-- webcit/static/t/tab_siteconfig_network.html | 3 --- webcit/webcit.h | 10 +++----- 9 files changed, 7 insertions(+), 49 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index fa979d093..5751624e7 100644 --- 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 07edd88ba..03ffa7c75 100644 --- 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 71f609608..d14b3b4f4 100644 --- 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 c6fc94731..314ecbaa1 100644 --- 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 b5ff9e9d5..05e6eacb1 100644 --- 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 9401b345e..5197abeae 100644 --- 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 6e8a17a0e..785a54d36 100644 --- 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 49f1649fa..155d6c7ff 100644 --- a/webcit/static/t/tab_siteconfig_network.html +++ b/webcit/static/t/tab_siteconfig_network.html @@ -57,7 +57,4 @@ - - - diff --git a/webcit/webcit.h b/webcit/webcit.h index 21cc98451..381204299 100644 --- 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 -- 2.30.2