void updatels(CtdlIPC *ipc)
{ /* make all messages old in current room */
- char buf[SIZ];
+ char buf[256];
int r; /* IPC response code */
if (rc_alt_semantics) {
*/
void updatelsa(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
int r; /* IPC response code */
r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
*/
void cli_upload(CtdlIPC *ipc)
{
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
- char tbuf[SIZ];
+ char buf[256];
+ char tbuf[256];
int r; /* IPC response code */
int a;
int fd;
*/
void cli_image_upload(CtdlIPC *ipc, char *keyname)
{
- char flnm[SIZ];
- char buf[SIZ];
+ char flnm[PATH_MAX];
+ char buf[256];
int r;
/* Can we upload this image? */
*/
void upload(CtdlIPC *ipc, int c)
{ /* c = upload mode */
- char flnm[SIZ];
+ char flnm[PATH_MAX];
char desc[151];
- char buf[SIZ];
+ char buf[256];
char tbuf[4096];
int xfer_pid;
int a, b;
int val_user(CtdlIPC *ipc, char *user, int do_validate)
{
int a;
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
char *resp = NULL;
int ax = 0;
char answer[2];
void validate(CtdlIPC *ipc)
{ /* validate new users */
- char cmd[SIZ];
- char buf[SIZ];
+ char cmd[256];
+ char buf[256];
int finished = 0;
int r; /* IPC response code */
void deletefile(CtdlIPC *ipc)
{
char filename[32];
- char buf[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 31);
if (strlen(filename) == 0)
*/
void netsendfile(CtdlIPC *ipc)
{
- char filename[32], destsys[20], buf[SIZ];
+ char filename[32], destsys[20], buf[256];
newprompt("Filename: ", filename, 31);
if (strlen(filename) == 0)
{
char filename[64];
char newroom[ROOMNAMELEN];
- char buf[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 63);
if (strlen(filename) == 0)
*/
void list_bio(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
char *resp = NULL;
int pos = 1;
int r; /* IPC response code */
pprintf("%s\n", buf);
return;
}
- while (strlen(resp)) {
+ while (resp && strlen(resp)) {
extract_token(buf, resp, 0, '\n', sizeof buf);
remove_token(resp, 0, '\n');
if ((pos + strlen(buf) + 5) > screenwidth) {
*/
void read_bio(CtdlIPC *ipc)
{
- char who[SIZ];
- char buf[SIZ];
+ char who[256];
+ char buf[256];
char *resp = NULL;
int r; /* IPC response code */
void do_system_configuration(CtdlIPC *ipc)
{
-#define NUM_CONFIGS 43
+#define NUM_CONFIGS 57
- char buf[SIZ];
+ char buf[256];
char sc[NUM_CONFIGS][256];
char *resp = NULL;
struct ExpirePolicy *site_expirepolicy = NULL;
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("Modem dialup number", &sc[3][0], 15);
+ strprompt("Telephone number", &sc[3][0], 15);
strprompt("Geographic location of this system", &sc[12][0], 31);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
else {
sc[18][0] = 0;
}
-
+ snprintf(sc[52], sizeof sc[52], "%d", (boolprompt(
+ "Use system authentication",
+ atoi(&sc[52][0]))));
/* Server tuning */
strprompt("Maximum message length", &sc[20][0], 20);
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
+ snprintf(sc[43], sizeof sc[43], "%d", (boolprompt(
+ "Automatically delete committed database logs",
+ atoi(&sc[43][0]))));
strprompt("Server IP address (0.0.0.0 for 'any')", &sc[37][0], 15);
strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
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);
-
+ strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
+ strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
/* This logic flips the question around, because it's one of those
* situations where 0=yes and 1=no
*/
a);
a = (a ? 0 : 1);
snprintf(sc[25], sizeof sc[25], "%d", a);
+ snprintf(sc[45], sizeof sc[45], "%d", (boolprompt(
+ "Allow unauthenticated SMTP clients to spoof my domains",
+ atoi(&sc[45][0]))));
+ snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
+ "Instantly expunge deleted IMAP messages",
+ atoi(&sc[44][0]))));
/* LDAP settings */
if (ipc->ServInfo.supports_ldap) {
"Enable full text search index (warning: resource intensive)",
atoi(&sc[42][0]))));
+ snprintf(sc[46], sizeof sc[46], "%d", (boolprompt(
+ "Perform journaling of email messages",
+ atoi(&sc[46][0]))));
+ snprintf(sc[47], sizeof sc[47], "%d", (boolprompt(
+ "Perform journaling of non-email messages",
+ atoi(&sc[47][0]))));
+ if ( (atoi(&sc[46][0])) || (atoi(&sc[47][0])) ) {
+ strprompt("Email destination of journalized messages",
+ &sc[48][0], 127);
+ }
+
+ /* Funambol push stuff */
+ strprompt("Funambol server (blank to disable)", &sc[53][0], 63);
+ strprompt("Funambol server port", &sc[54][0], 5);
+ strprompt("Funambol sync source", &sc[55][0], 63);
+ strprompt("Funambol authentication details (user:pass in Base64)", &sc[56][0],63);
+
/* Save it */
scr_printf("Save this configuration? ");
if (yesno()) {
*/
void do_internet_configuration(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
char *resp = NULL;
int num_recs = 0;
char **recs = NULL;
pid_t editor_pid;
int cksum;
int b, i, tokens;
- char buf[SIZ];
- char instr[SIZ];
- char addr[SIZ];
+ char buf[1024];
+ char instr[1024];
+ char addr[1024];
FILE *tempfp;
FILE *changefp;
char *listing = NULL;
return;
}
- snprintf(filename, sizeof filename, "%s.listedit", tmpnam(NULL));
- snprintf(changefile, sizeof changefile, "%s.listedit", tmpnam(NULL));
+ CtdlMakeTempFileName(filename, sizeof filename);
+ CtdlMakeTempFileName(changefile, sizeof changefile);
tempfp = fopen(filename, "w");
if (tempfp == NULL) {
}
if (file_checksum(filename) == cksum) {
- err_printf("*** Not saving changes.\n");
+ err_printf("*** No changes to save.\n");
e_ex_code = 1;
}
if (e_ex_code == 0) { /* Save changes */
changefp = fopen(changefile, "w");
+
+ /* Load all netconfig entries that are *not* of the type we are editing */
r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
if (r / 100 == 1) {
while(listing && strlen(listing)) {
free(listing);
listing = NULL;
}
+
+ /* ...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) {
projects / citadel.git / blobdiff