#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <assert.h>
#include <libcitadel.h>
#include "../../citadel.h"
#include "../../server.h"
else
cprintf("550 %s\r\n", message_to_spammer);
CC->kill_me = KILLME_SPAMMER;
- /* no need to free_recipients(valid), it's not allocated yet */
+ // no need to free_recipients(valid), it's not allocated yet
return;
}
}
}
else {
if (which_command == EHLO) {
- cprintf("250-Hello %s (%s [%s])\r\n",
- ChrPtr(SMTP->helo_node),
- CC->cs_host,
- CC->cs_addr
- );
+ cprintf("250-Hello %s (%s [%s])\r\n", ChrPtr(SMTP->helo_node), CC->cs_host, CC->cs_addr);
}
else {
cprintf("250-Greetings and joyous salutations.\r\n");
#ifdef HAVE_OPENSSL
// Offer TLS, but only if TLS is not already active.
- // Furthermore, only offer TLS when running on
- // the SMTP-MSA port, not on the SMTP-MTA port, due to
- // questionable reliability of TLS in certain sending MTA's.
+ // Furthermore, only offer TLS when running on the SMTP-MSA port, not on the SMTP-MTA port,
+ // because if our server doesn't have a trusted certificate, some mailers will refuse to talk to it.
if ( (!CC->redirect_ssl) && (SMTP->is_msa) ) {
cprintf("250-STARTTLS\r\n");
}
return;
}
- len = extract_token(encoded_authstring,
- ChrPtr(SMTP->Cmd) + 5,
- 1, ' ',
- sizeof encoded_authstring);
+ len = extract_token(encoded_authstring, ChrPtr(SMTP->Cmd) + 5, 1, ' ', sizeof encoded_authstring);
StrBufPlain(SMTP->Cmd, encoded_authstring, len);
smtp_try_plain();
return;
((CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_CORRECT) ||
(CtdlGetConfigInt("c_rfc822_strict_from") == CFG_SMTP_FROM_REJECT) ) )
{
- if (!IsEmptyStr(CC->cs_inet_email))
+ if (!IsEmptyStr(CC->cs_inet_email)) {
validemail = strcmp(CC->cs_inet_email, msg->cm_fields[erFc822Addr]) == 0;
- if ((!validemail) &&
- (!IsEmptyStr(CC->cs_inet_other_emails)))
- {
+ }
+ if ((!validemail) && (!IsEmptyStr(CC->cs_inet_other_emails))) {
int num_secondary_emails = 0;
int i;
num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
void smtp_command_loop(void) {
static const ConstStr AuthPlainStr = {HKEY("AUTH PLAIN")};
- if (SMTP == NULL) {
- syslog(LOG_ERR, "serv_smtp: Session SMTP data is null. WTF? We will crash now.");
- abort();
- }
+ assert(SMTP != NULL);
time(&CC->lastcmd);
if (CtdlClientGetLine(SMTP->Cmd) < 1) {
}
-/*****************************************************************************/
-/* MODULE INITIALIZATION STUFF */
-/*****************************************************************************/
-/*
- * This cleanup function blows away the temporary memory used by
- * the SMTP server.
- */
-void smtp_cleanup_function(void)
-{
- /* Don't do this stuff if this is not an SMTP session! */
+// *****************************************************************************
+// * MODULE INITIALIZATION STUFF *
+// *****************************************************************************
+
+// This cleanup function blows away the temporary memory used by
+// the SMTP server.
+void smtp_cleanup_function(void) {
+ // Don't do this stuff if this is not an SMTP session!
if (CC->h_command_function != smtp_command_loop) return;
syslog(LOG_DEBUG, "Performing SMTP cleanup hook");
// Initialization function, called from modules_init.c
char *ctdl_module_init_smtp(void) {
if (!threading) {
- CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtp_port"), /* SMTP MTA */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtp_port"), // SMTP MTA
NULL,
smtp_mta_greeting,
smtp_command_loop,
CitadelServiceSMTP_MTA);
#ifdef HAVE_OPENSSL
- CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtps_port"), /* SMTPS MTA */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_smtps_port"), // SMTPS MTA
NULL,
smtps_greeting,
smtp_command_loop,
CitadelServiceSMTPS_MTA);
#endif
- CtdlRegisterServiceHook(CtdlGetConfigInt("c_msa_port"), /* SMTP MSA */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_msa_port"), // SMTP MSA
NULL,
smtp_msa_greeting,
smtp_command_loop,
NULL,
CitadelServiceSMTP_MSA);
- CtdlRegisterServiceHook(0, /* local LMTP */
+ CtdlRegisterServiceHook(0, // local LMTP
file_lmtp_socket,
lmtp_greeting,
smtp_command_loop,
NULL,
CitadelServiceSMTP_LMTP);
- CtdlRegisterServiceHook(0, /* local LMTP */
+ CtdlRegisterServiceHook(0, // local LMTP
file_lmtp_unfiltered_socket,
lmtp_unfiltered_greeting,
smtp_command_loop,
CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP, PRIO_STOP + 250);
}
- /* return our module name for the log */
+ // return our module name for the log
return "smtp";
}
} COMMAND;
COMMAND commands[] = {
- {"?", cmd_help, "Display this message"},
- {"help", cmd_help, "Display this message"},
- {"date", cmd_datetime, "Print the server's date and time"},
- {"config", cmd_config, "Configure the Citadel server"},
- {"export", cmd_export, "Export all Citadel databases"},
- {"shutdown", cmd_shutdown, "Shut down the Citadel server"},
- {"time", cmd_datetime, "Print the server's date and time"},
- {"passwd", cmd_passwd, "Set or change an account password"},
- {"who", cmd_who, "Display a list of online users"},
- {"mailq", cmd_mailq, "Show the outbound email queue"},
- {NULL, NULL, NULL}
+ { "?", cmd_help, "Display this message" },
+ { "help", cmd_help, "Display this message" },
+ { "date", cmd_datetime, "Print the server's date and time" },
+ { "config", cmd_config, "Configure the Citadel server" },
+ { "export", cmd_export, "Export all Citadel databases" },
+ { "shutdown", cmd_shutdown, "Shut down the Citadel server" },
+ { "time", cmd_datetime, "Print the server's date and time" },
+ { "passwd", cmd_passwd, "Set or change an account password" },
+ { "who", cmd_who, "Display a list of online users" },
+ { "mailq", cmd_mailq, "Show the outbound email queue" },
+ { NULL, NULL, NULL }
};
sock_getln(server_socket, buf, sizeof buf);
if (buf[0] == '1') {
i = 0;
- while (sock_getln(server_socket, buf, sizeof buf), strcmp(buf, "000")) {
+ while (sock_getln(server_socket, buf, sizeof buf),
+ strcmp(buf, "000")) {
if (i == 1) {
sprintf(prompt, "\n%s> ", buf);
}
/* Here we go ... main command loop */
rl_attempted_completion_function = command_name_completion;
- while ( (cmd = readline(prompt)) , cmd ) {
+ while ((cmd = readline(prompt)), cmd) {
if (*cmd) {
add_history(cmd);
ret = do_one_command(server_socket, cmd);
int is_interactive = ((strlen(cmd) == 0) ? 1 : 0);
if (is_interactive) {
- printf("\nCitadel administration shell (c) 2009-2020 by citadel.org\n"
- "This is open source software made available to you under the terms\n"
- "of the GNU General Public License v3. All other rights reserved.\n");
+ printf
+ ("\nCitadel administration shell (c) 2009-2020 by citadel.org\n"
+ "This is open source software made available to you under the terms\n"
+ "of the GNU General Public License v3. All other rights reserved.\n");
printf("Connecting to Citadel server in %s...\n", ctdldir);
}
// Configuration screens that are part of the text mode client.
//
-// Copyright (c) 1987-2018 by the citadel.org team
+// 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.
char editor_path[PATH_MAX];
-/*
- * General system configuration command
- */
+// General system configuration command
void do_system_configuration(CtdlIPC * ipc) {
char buf[256];
char sc[NUM_CONFIGS][256];
struct ExpirePolicy *mbx_expirepolicy = NULL;
int a;
int logpages = 0;
- int r; /* IPC response code */
+ int r; // IPC response code
int server_configs = 0;
- /* Clear out the config buffers */
+ // Clear out the config buffers
memset(&sc[0][0], 0, sizeof(sc));
- /* Fetch the current config */
+ // Fetch the current config
r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
if (r / 100 == 1) {
server_configs = num_tokens(resp, '\n');
free(resp);
}
resp = NULL;
- /* Fetch the expire policy (this will silently fail on old servers,
- * resulting in "default" policy)
- */
+
+ // Fetch the expire policy (this will silently fail on old servers, resulting in "default" policy)
r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &site_expirepolicy, buf);
r = CtdlIPCGetMessageExpirationPolicy(ipc, 3, &mbx_expirepolicy, buf);
- /* Identification parameters */
-
+ // Identification parameters
strprompt("Node name", &sc[0][0], 15);
strprompt("Fully qualified domain name", &sc[1][0], 63);
strprompt("Human readable node name", &sc[2][0], 20);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
- /* Security parameters */
-
+ // Security parameters
snprintf(sc[7], sizeof sc[7], "%d", (boolprompt("Require registration for new users", atoi(&sc[7][0]))));
snprintf(sc[29], sizeof sc[29], "%d", (boolprompt("Disable self-service user account creation", atoi(&sc[29][0]))));
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
snprintf(sc[67], sizeof sc[67], "%d", (boolprompt("Allow anonymous guest logins", atoi(&sc[67][0]))));
- snprintf(sc[4], sizeof sc[4], "%d", (boolprompt("Automatically give room admin privs to a user who creates a private room",
- atoi(&sc[4][0]))));
-
+ snprintf(sc[4], sizeof sc[4], "%d", (boolprompt("Automatically give room admin privs to a user who creates a private room", atoi(&sc[4][0]))));
snprintf(sc[8], sizeof sc[8], "%d", (boolprompt("Automatically move problem user messages to twit room", atoi(&sc[8][0]))));
-
strprompt("Name of twit room", &sc[9][0], ROOMNAMELEN);
- snprintf(sc[11], sizeof sc[11], "%d", (boolprompt("Restrict Internet mail to only those with that privilege",
- atoi(&sc[11][0]))));
+ snprintf(sc[11], sizeof sc[11], "%d", (boolprompt("Restrict Internet mail to only those with that privilege", atoi(&sc[11][0]))));
snprintf(sc[26], sizeof sc[26], "%d", (boolprompt("Allow admins to Zap (forget) rooms", atoi(&sc[26][0]))));
if (!IsEmptyStr(&sc[18][0])) {
sc[18][0] = 0;
}
- /* Commented out because this setting isn't really appropriate to
- * change while the server is running.
- *
- * snprintf(sc[52], sizeof sc[52], "%d", (boolprompt(
- * "Use system authentication",
- * atoi(&sc[52][0]))));
- */
-
- /* Server tuning */
-
+ // Server tuning
strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
strprompt("Maximum concurrent sessions", &sc[14][0], 4);
strprompt("Maximum message length", &sc[20][0], 20);
strprompt("XMPP (Jabber) client to server port (-1 to disable)", &sc[62][0], 5);
// strprompt("XMPP (Jabber) server to server port (-1 to disable)", &sc[63][0], 5); This is just a placeholder.
- /* This logic flips the question around, because it's one of those
- * situations where 0=yes and 1=no
- */
+ // This logic flips the question around, because it's one of those situations where 0=yes and 1=no
a = atoi(sc[25]);
a = (a ? 0 : 1);
a = boolprompt("Correct forged From: lines during authenticated SMTP", a);
snprintf(sc[66], sizeof sc[66], "%d", (boolprompt("Flag messages as spam instead of rejecting", atoi(&sc[66][0]))));
- /* This logic flips the question around, because it's one of those
- * situations where 0=yes and 1=no
- */
+ // This logic flips the question around, because it's one of those situations where 0=yes and 1=no
a = atoi(sc[61]);
a = (a ? 0 : 1);
a = boolprompt("Force IMAP posts in public rooms to be from the user who submitted them", a);
a = (a ? 0 : 1);
snprintf(sc[61], sizeof sc[61], "%d", a);
- snprintf(sc[45], sizeof sc[45], "%d", (boolprompt("Allow unauthenticated SMTP clients to spoof my domains",
- atoi(&sc[45][0]))));
- snprintf(sc[57], sizeof sc[57], "%d", (boolprompt("Perform RBL checks at greeting instead of after RCPT",
- atoi(&sc[57][0]))));
+ snprintf(sc[45], sizeof sc[45], "%d", (boolprompt("Allow unauthenticated SMTP clients to spoof my domains", atoi(&sc[45][0]))));
+ snprintf(sc[57], sizeof sc[57], "%d", (boolprompt("Perform RBL checks at greeting instead of after RCPT", atoi(&sc[57][0]))));
- /* LDAP settings */
+ // LDAP settings
if (ipc->ServInfo.supports_ldap) {
a = strlen(&sc[32][0]);
- a = (a ? 1 : 0); /* Set only to 1 or 0 */
+ a = (a ? 1 : 0); // Set only to 1 or 0
a = boolprompt("Do you want to configure LDAP authentication?", a);
if (a) {
strprompt("Host name of LDAP server", &sc[32][0], 127);
strprompt("Base DN", &sc[34][0], 255);
strprompt("Bind DN (or blank for anonymous bind)", &sc[35][0], 255);
strprompt("Password for bind DN (or blank for anonymous bind)", &sc[36][0], 255);
- } else {
+ }
+ else {
strcpy(&sc[32][0], "");
}
}
- /* Expiry settings */
+ // Expiry settings
strprompt("Default user purge time (days)", &sc[16][0], 5);
strprompt("Default room purge time (days)", &sc[17][0], 5);
- /* Angels and demons dancing in my head... */
+ // Angels and demons dancing in my head...
do {
snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_mode);
strprompt("System default message expire policy (? for list)", buf, 1);
} while ((buf[0] < '1') || (buf[0] > '3'));
site_expirepolicy->expire_mode = buf[0] - '0';
- /* ...lunatics and monsters underneath my bed */
+ // ...lunatics and monsters underneath my bed
if (site_expirepolicy->expire_mode == 2) {
snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
strprompt("Keep how many messages online?", buf, 10);
site_expirepolicy->expire_value = atol(buf);
}
- /* Media messiahs preying on my fears... */
+ // Media messiahs preying on my fears...
do {
snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_mode);
strprompt("Mailbox default message expire policy (? for list)", buf, 1);
} while ((buf[0] < '0') || (buf[0] > '3'));
mbx_expirepolicy->expire_mode = buf[0] - '0';
- /* ...Pop culture prophets playing in my ears */
+ // ...Pop culture prophets playing in my ears
if (mbx_expirepolicy->expire_mode == 2) {
snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
strprompt("Keep how many messages online?", buf, 10);
strprompt("Email destination of journalized messages", &sc[48][0], 127);
}
- /* No more Funambol */
+ // No more Funambol
sc[53][0] = 0;
sc[54][0] = 0;
sc[55][0] = 0;
sc[56][0] = 0;
- /* External pager stuff */
+ // External pager stuff
int yes_pager = 0;
if (strlen(sc[60]) > 0) {
yes_pager = 1;
yes_pager = boolprompt("Configure an external pager tool", yes_pager);
if (yes_pager) {
strprompt("External pager tool", &sc[60][0], 255);
- } else {
+ }
+ else {
sc[60][0] = 0;
}
- /* Save it */
+ // Save it
scr_printf("Save this configuration? ");
if (yesno()) {
r = 1;
}
-/*
- * support function for do_internet_configuration()
- */
-void get_inet_rec_type(CtdlIPC * ipc, char *buf)
-{
+// support function for do_internet_configuration()
+void get_inet_rec_type(CtdlIPC * ipc, char *buf) {
int sel;
keyopt(" <1> localhost (Alias for this computer)\n");
}
-/*
- * Internet mail configuration
- */
-void do_internet_configuration(CtdlIPC * ipc)
-{
+// Internet mail configuration
+void do_internet_configuration(CtdlIPC * ipc) {
char buf[256];
char *resp = NULL;
int num_recs = 0;
extract_token(buf, resp, 0, '\n', sizeof buf);
remove_token(resp, 0, '\n');
- // VILE SLEAZY HACK: replace obsolete "directory" domains with "localhost"
+ // "directory" is no longer used. replace it with "localhost"
char *d = strstr(buf, "|directory");
if (d != NULL) {
strcpy(d, "|localhost");
strcpy(recs[num_recs - 1], buf);
}
}
- if (resp)
+ if (resp) {
free(resp);
+ }
do {
scr_printf("\n");
++num_recs;
if (num_recs == 1) {
recs = malloc(sizeof(char *));
- } else {
+ }
+ else {
recs = realloc(recs, (sizeof(char *)) * num_recs);
}
strcat(buf, "|");
break;
case 's':
r = 1;
- for (i = 0; i < num_recs; i++)
+ for (i = 0; i < num_recs; i++) {
r += 1 + strlen(recs[i]);
+ }
resp = (char *) calloc(1, r);
if (!resp) {
scr_printf("Can't save config - out of memory!\n");
r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
if (r / 100 != 4) {
scr_printf("%s\n", buf);
- } else {
+ }
+ else {
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
}
-
-/*
- * Edit network configuration for room sharing, mailing lists, etc.
- */
-void network_config_management(CtdlIPC * ipc, char *entrytype, char *comment)
-{
+// Edit network configuration for room sharing, mailing lists, etc.
+void network_config_management(CtdlIPC * ipc, char *entrytype, char *comment) {
char filename[PATH_MAX];
char changefile[PATH_MAX];
int e_ex_code;
}
fclose(tempfp);
- e_ex_code = 1; /* start with a failed exit code */
+ e_ex_code = 1; // start with a failed exit code
stty_ctdl(SB_RESTORE);
editor_pid = fork();
cksum = file_checksum(filename);
e_ex_code = 1;
}
- if (e_ex_code == 0) { /* Save changes */
+ if (e_ex_code == 0) { // Save changes
changefp = fopen(changefile, "w");
- /* Load all netconfig entries that are *not* of the type we are editing */
+ // Load all netconfig entries that are *not* of the type we are editing
r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
if (r / 100 == 1) {
while (listing && !IsEmptyStr(listing)) {
listing = NULL;
}
- /* ...and merge that with the data we just edited */
+ // ...and merge that with the data we just edited
tempfp = fopen(filename, "r");
while (fgets(buf, sizeof buf, tempfp) != NULL) {
for (i = 0; i < strlen(buf); ++i) {
fclose(tempfp);
fclose(changefp);
- /* now write it to the server... */
+ // now write it to the server...
changefp = fopen(changefile, "r");
if (changefp != NULL) {
listing = load_message_from_file(changefp);
}
}
- unlink(filename); /* Delete the temporary files */
+ unlink(filename); // Delete the temporary files
unlink(changefile);
}
-/*
- * POP3 aggregation client configuration
- */
-void do_pop3client_configuration(CtdlIPC * ipc)
-{
+// POP3 aggregation client configuration
+void do_pop3client_configuration(CtdlIPC * ipc) {
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
strcat(listing, "\n");
}
- /* Retrieve all the *other* records for merging */
+ // Retrieve all the *other* records for merging
r = CtdlIPCGetRoomNetworkConfig(ipc, &other_listing, buf);
if (r / 100 == 1) {
for (i = 0; i < num_tokens(other_listing, '\n'); ++i) {
if (r / 100 != 4) {
scr_printf("%s\n", buf);
- } else {
+ }
+ else {
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
} while (!quitting);
if (recs != NULL) {
- for (i = 0; i < num_recs; ++i)
+ for (i = 0; i < num_recs; ++i) {
free(recs[i]);
+ }
free(recs);
}
}
-/*
- * RSS feed retrieval client configuration
- */
-void do_rssclient_configuration(CtdlIPC * ipc)
-{
+// RSS feed retrieval client configuration
+void do_rssclient_configuration(CtdlIPC * ipc) {
char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
++num_recs;
if (num_recs == 1) {
recs = malloc(sizeof(char *));
- } else {
+ }
+ else {
recs = realloc(recs, (sizeof(char *)) * num_recs);
}
strcpy(buf, "rssclient|");
strcat(listing, "\n");
}
- /* Retrieve all the *other* records for merging */
+ // Retrieve all the *other* records for merging
r = CtdlIPCGetRoomNetworkConfig(ipc, &other_listing, buf);
if (r / 100 == 1) {
for (i = 0; i < num_tokens(other_listing, '\n'); ++i) {
if (r / 100 != 4) {
scr_printf("%s\n", buf);
- } else {
+ }
+ else {
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
projects / citadel.git / commitdiff