#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
#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);
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");
}
case 71:
CtdlSetConfigInt("c_nntps_port", atoi(buf));
break;
+ case 72:
+ CtdlSetConfigInt("smtp_advertise_starttls", atoi(buf));
+ break;
}
++a;
}
// 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));
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);
#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.
-// 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
#define READ_HEADER 2
#define READ_MSGBODY 3
-#define NUM_CONFIGS 72
+#define NUM_CONFIGS 73
#define NEXT_KEY 15
#define STOP_KEY 3
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);
/*
* 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"
{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")}
};
<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")>'>
+<?_("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>
#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 */