From 33a166e5fa4b6e3b013d6093a957fc3ba7edc252 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 24 Jan 2012 12:02:42 -0500 Subject: [PATCH] Server changes to support upcoming overhaul of setup.c --- citadel/citadel.h | 3 +++ citadel/control.c | 18 ++++++++++-------- citadel/textclient/tuiconfig.c | 14 ++++++++++++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index 8c58ff58d..cdc0a6b7e 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -232,6 +232,9 @@ enum { #define GF_SKIP 1 /* <;S>kip floor mode */ #define GF_ZAP 2 /* <;Z>ap floor mode */ +/* number of items which may be handled by the CONF command */ +#define NUM_CONFIGS 70 + /* * MIME types used in Citadel for configuration stuff */ diff --git a/citadel/control.c b/citadel/control.c index 6ba0f8fe1..bd4136635 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -1,21 +1,15 @@ /* * This module handles states which are global to the entire server. * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2012 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -427,6 +421,8 @@ void cmd_conf(char *argbuf) cprintf("%ld\n", config.c_pop3_fastest); cprintf("%d\n", config.c_spam_flag_only); cprintf("%d\n", config.c_guest_logins); + cprintf("%d\n", config.c_port_number); + cprintf("%d\n", config.c_ctdluid); cprintf("000\n"); } @@ -686,6 +682,12 @@ void cmd_conf(char *argbuf) case 67: config.c_guest_logins = atoi(buf); break; + case 68: + config.c_port_number = atoi(buf); + break; + case 69: + config.c_ctdluid = atoi(buf); + break; } ++a; } diff --git a/citadel/textclient/tuiconfig.c b/citadel/textclient/tuiconfig.c index 60c1ada10..df5c43bd5 100644 --- a/citadel/textclient/tuiconfig.c +++ b/citadel/textclient/tuiconfig.c @@ -1,6 +1,15 @@ /* * Configuration screens that are part of the text mode client. * + * Copyright (c) 1987-2012 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. */ #include @@ -62,7 +71,7 @@ extern int screenwidth; void do_system_configuration(CtdlIPC *ipc) { -#define NUM_CONFIGS 68 + /* NUM_CONFIGS is now defined in citadel.h */ char buf[256]; char sc[NUM_CONFIGS][256]; @@ -355,8 +364,9 @@ void do_system_configuration(CtdlIPC *ipc) scr_printf("Save this configuration? "); if (yesno()) { r = 1; - for (a = 0; a < NUM_CONFIGS; a++) + for (a = 0; a < NUM_CONFIGS; a++) { r += 1 + strlen(sc[a]); + } resp = (char *)calloc(1, r); if (!resp) { scr_printf("Can't save config - out of memory!\n"); -- 2.30.2