From 05abe4c6adfe1d12af53eba1e57046da8a038a88 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 29 Jan 2024 18:57:09 -0500 Subject: [PATCH] Release version 997 generated by do-release.sh --- citadel/server/citadel_defs.h | 2 +- citadel/server/citadel_dirs.h | 1 - citadel/server/control.c | 4 ++++ citadel/server/modules/calendar/serv_calendar.c | 5 ++--- libcitadel/lib/libcitadel.h | 2 +- release_version.txt | 2 +- textclient/textclient.h | 15 +++++---------- textclient/tuiconfig.c | 1 + webcit/siteconfig.c | 14 +++++--------- webcit/static/t/aide/siteconfig/tab_smtp.html | 4 +++- webcit/webcit.h | 2 +- 11 files changed, 24 insertions(+), 28 deletions(-) diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h index 167dcfffb..b5221d1a7 100644 --- a/citadel/server/citadel_defs.h +++ b/citadel/server/citadel_defs.h @@ -21,7 +21,7 @@ #include "typesize.h" #include "ipcdef.h" -#define REV_LEVEL 996 // This version +#define REV_LEVEL 997 // This version #define REV_MIN 591 // Oldest compatible database #define EXPORT_REV_MIN 931 // Oldest compatible export files #define LIBCITADEL_MIN 951 // Minimum required version of libcitadel diff --git a/citadel/server/citadel_dirs.h b/citadel/server/citadel_dirs.h index 9d00640db..c1f9e7e35 100644 --- a/citadel/server/citadel_dirs.h +++ b/citadel/server/citadel_dirs.h @@ -41,7 +41,6 @@ #define file_chkpwd CTDLDIR "/chkpwd" #define file_guesstimezone CTDLDIR "/guesstimezone.sh" - // externs extern int create_run_directories(long UID, long GUID); extern size_t assoc_file_name(char *buf, size_t n, struct ctdlroom *qrbuf, const char *prefix); diff --git a/citadel/server/control.c b/citadel/server/control.c index a6ff32901..b3df0ae3f 100644 --- a/citadel/server/control.c +++ b/citadel/server/control.c @@ -295,6 +295,7 @@ void cmd_conf(char *argbuf) { cprintf("%d\n", ctdluid); cprintf("%d\n", CtdlGetConfigInt("c_nntp_port")); cprintf("%d\n", CtdlGetConfigInt("c_nntps_port")); + cprintf("%d\n", CtdlGetConfigInt("smtp_advertise_starttls")); cprintf("000\n"); } @@ -542,6 +543,9 @@ void cmd_conf(char *argbuf) { case 71: CtdlSetConfigInt("c_nntps_port", atoi(buf)); break; + case 72: + CtdlSetConfigInt("smtp_advertise_starttls", atoi(buf)); + break; } ++a; } diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c index 39b62880a..23b4ce934 100644 --- a/citadel/server/modules/calendar/serv_calendar.c +++ b/citadel/server/modules/calendar/serv_calendar.c @@ -102,7 +102,6 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { // If the caller did not supply a user, write to the currently selected room if (!u) { - struct CitContext *CCC = CC; StrBuf *MsgBody; msg = malloc(sizeof(struct CtdlMessage)); @@ -110,8 +109,8 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) { msg->cm_magic = CTDLMESSAGE_MAGIC; msg->cm_anon_type = MES_NORMAL; msg->cm_format_type = 4; - CM_SetField(msg, eAuthor, CCC->user.fullname); - CM_SetField(msg, eOriginalRoom, CCC->room.QRname); + CM_SetField(msg, eAuthor, CC->user.fullname); + CM_SetField(msg, eOriginalRoom, CC->room.QRname); MsgBody = NewStrBufPlain(NULL, serlen + 100); StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0); diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index fd19bfaa1..ebb9ff8b1 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -19,7 +19,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 996 +#define LIBCITADEL_VERSION_NUMBER 997 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/release_version.txt b/release_version.txt index 748632cfe..eeb072e53 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -996 +997 diff --git a/textclient/textclient.h b/textclient/textclient.h index dadf79255..bc5d171aa 100644 --- a/textclient/textclient.h +++ b/textclient/textclient.h @@ -1,17 +1,12 @@ -// Copyright (c) 1987-2022 by the citadel.org team +// Copyright (c) 1987-2024 by the citadel.org team // -// This program is open source software. Use, duplication, and/or -// disclosure is subject to the GNU General Purpose License version 3. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// This program is open source software. Use, duplication, or disclosure +// is subject to the GNU General Purpose License version 3. #define UDS "_UDS_" #define DEFAULT_HOST "localhost" #define DEFAULT_PORT "504" -#define CLIENT_VERSION 996 +#define CLIENT_VERSION 997 #define CLIENT_TYPE 0 // commands we can send to the stty_ctdl() routine @@ -31,7 +26,7 @@ #define READ_HEADER 2 #define READ_MSGBODY 3 -#define NUM_CONFIGS 72 +#define NUM_CONFIGS 73 #define NEXT_KEY 15 #define STOP_KEY 3 diff --git a/textclient/tuiconfig.c b/textclient/tuiconfig.c index ee6006b92..cdb7872aa 100644 --- a/textclient/tuiconfig.c +++ b/textclient/tuiconfig.c @@ -108,6 +108,7 @@ void do_system_configuration(CtdlIPC * ipc) { strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5); strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5); strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5); + snprintf(sc[72], sizeof sc[72], "%d", (boolprompt("Advertise STARTTLS on the SMTP port", atoi(&sc[72][0])))); strprompt("NNTP server port (-1 to disable)", &sc[70][0], 5); strprompt("NNTPS server port (-1 to disable)", &sc[71][0], 5); strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5); diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index b82b0d2ab..76e0ef0a3 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -1,15 +1,10 @@ /* * Administrative screen for site-wide configuration * - * Copyright (c) 1996-2021 by the citadel.org team + * Copyright (c) 1996-2024 by the citadel.org team * - * This program is open source software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is open source software. Use, duplication, or disclosure + * are subject to the terms of the GNU General Public License version 3. */ #include "webcit.h" @@ -216,7 +211,8 @@ CfgMapping ServerConfig[] = { {CFG_STR, 0, 0, "", HKEY("c_port_number")}, {CFG_STR, 0, 0, "", HKEY("c_ctdluid")}, {CFG_STR, 0, 0, "", HKEY("c_nntp_port")}, - {CFG_STR, 0, 0, "", HKEY("c_nntps_port")} + {CFG_STR, 0, 0, "", HKEY("c_nntps_port")}, + {CFG_YES, 0, 0, "", HKEY("smtp_advertise_starttls")} }; diff --git a/webcit/static/t/aide/siteconfig/tab_smtp.html b/webcit/static/t/aide/siteconfig/tab_smtp.html index 4c747a660..01e7af369 100644 --- a/webcit/static/t/aide/siteconfig/tab_smtp.html +++ b/webcit/static/t/aide/siteconfig/tab_smtp.html @@ -3,7 +3,9 @@
+  +> + diff --git a/webcit/webcit.h b/webcit/webcit.h index 296398701..ce54a18e8 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -127,7 +127,7 @@ extern char *ssl_cipher_list; #define PORT_NUM 80 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 996 /* This version of WebCit */ +#define CLIENT_VERSION 997 /* This version of WebCit */ #define MINIMUM_CIT_VERSION 931 /* Minimum required version of Citadel server */ #define LIBCITADEL_MIN 931 /* Minimum required version of libcitadel */ #define DEFAULT_CTDLDIR "/usr/local/citadel" /* Default Citadel server directory */ -- 2.30.2
-