Remove preprocessor tests for OpenSSL. It's a requirement.

[citadel.git] / textclient / tuiconfig.c

diff --git a/textclient/tuiconfig.c b/textclient/tuiconfig.c
index 209ff246333fead6eb81b230d278eabbac64f473..28a10ed15748772d5808a44bde2da45c30949b42 100644 (file)
--- a/textclient/tuiconfig.c
+++ b/textclient/tuiconfig.c
@@ -2,13 +2,7 @@
 //
 // Copyright (c) 1987-2022 by the citadel.org team
 //
-// This program is open source software.  Use, duplication, and/or
-// disclosure are 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 Public License version 3.
 
 #include "textclient.h"
 
@@ -108,6 +102,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);
@@ -374,7 +369,7 @@ void do_internet_configuration(CtdlIPC * ipc) {
                switch (ch) {
                case 'a':
                        newprompt("Enter host name: ", buf, 50);
-                       striplt(buf);
+                       string_trim(buf);
                        if (!IsEmptyStr(buf)) {
                                ++num_recs;
                                if (num_recs == 1) {
@@ -549,7 +544,7 @@ void network_config_management(CtdlIPC * ipc, char *entrytype, char *comment) {
                                if (buf[i] == '#')
                                        buf[i] = 0;
                        }
-                       striplt(buf);
+                       string_trim(buf);
                        if (!IsEmptyStr(buf)) {
                                fprintf(changefp, "%s|%s\n", entrytype, buf);
                        }