Release version 997 generated by do-release.sh

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index 167dcfffb33d99b1c3f2fec4d6a9737ea508909e..b5221d1a7bd83bf24530ef58d43e298ff308d565 100644 (file)
--- 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 9d00640db5603ed6bd0feef5b762092b31913c0f..c1f9e7e354c8ce6f5773fddfb8d4a41c2d55e520 100644 (file)
--- 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 a6ff329016082ac1886caa9a5a154d0a2d7d353e..b3df0ae3fbf97dd78beddf0302c493a67926413a 100644 (file)
--- 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 39b62880af38f638661d67363df9993ade4866b8..23b4ce93432b1ae08d71b6bc916a444c10d35ffb 100644 (file)
--- 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 fd19bfaa17debff37e8f6a0d08aeca69815ee9a0..ebb9ff8b1ab624a85f98a1f4710584953acfbd3a 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#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 748632cfea1dd2479dea1321baad21114eeda4a5..eeb072e53761eac26282343d7ace8d00f1250ca9 100644 (file)
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-996
+997

diff --git a/textclient/textclient.h b/textclient/textclient.h
index dadf79255836a392139cd77850a6d61ace39a2c3..bc5d171aabbfb0e8cfcc418bd15a76b1256bc36e 100644 (file)
--- 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 ee6006b92ba5678f738332dd1523c99a85dc2559..cdb7872aa2db75c1fc82cce27542f594938f28e1 100644 (file)
--- 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 b82b0d2ab4440618aef0df10f6fe829ad7e0819a..76e0ef0a359a8993f855d46496eca80c0e240a07 100644 (file)
--- 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 4c747a660fbd8c76de0f8564de3400aa3b416809..01e7af36948520c490404cd98103177fd8c8bac0 100644 (file)
--- a/webcit/static/t/aide/siteconfig/tab_smtp.html
+++ b/webcit/static/t/aide/siteconfig/tab_smtp.html
@@ -3,7 +3,9 @@
 <hr>
 <table border="0">
 <tr><td><?_("SMTP MTA port (-1 to disable)")></td><td>
-<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'></td></tr>
+<input type="text" NAME="c_smtp_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_smtp_port")>'>&nbsp;
+<?_("Offer STARTTLS")> <input type="checkbox" NAME="smtp_advertise_starttls" VALUE="yes" <?%("COND:SERVCFG", 1, "smtp_advertise_starttls", 1, "CHECKED", "")>>
+</td></tr>
 
 <tr><td><?_("SMTP MSA port (-1 to disable)")></td><td>
 <input type="text" NAME="c_msa_port" MAXLENGTH="5" VALUE='<?SERV:CFG("c_msa_port")>'></td></tr>

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 2963987011adddb8379eee173c7b0ec09243fe7b..ce54a18e81583f4f00f939ff30652ba54e8c465b 100644 (file)
--- 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 */