if (r / 100 == 1) {
int a = 0;
- while (reg && strlen(reg) > 0) {
+ while (reg && !IsEmptyStr(reg)) {
extract_token(buf, reg, 0, '\n', sizeof buf);
remove_token(reg, 0, '\n');
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;
else
newprompt("Enter filename: ", flnm, 15);
- for (a = 0; a < strlen(flnm); ++a)
+ for (a = 0; !IsEmptyStr(&flnm[0]); ++a)
if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
|| (flnm[a] == '?') || (flnm[a] == '*')
|| (flnm[a] == ';') || (flnm[a] == '&'))
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];
scr_printf("%s\n", buf);
if (a == 11)
scr_printf("%s\n", buf);
- } while (strlen(resp));
+ } while (!IsEmptyStr(resp));
scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
} else {
scr_printf("%s\n%s\n", user, &cmd[4]);
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)
+ if (IsEmptyStr(filename))
return;
CtdlIPCDeleteFile(ipc, filename, buf);
err_printf("%s\n", buf);
*/
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)
+ if (IsEmptyStr(filename))
return;
newprompt("System to send to: ", destsys, 19);
CtdlIPCNetSendFile(ipc, filename, destsys, buf);
{
char filename[64];
char newroom[ROOMNAMELEN];
- char buf[SIZ];
+ char buf[256];
newprompt("Filename: ", filename, 63);
- if (strlen(filename) == 0)
+ if (IsEmptyStr(filename))
return;
newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
CtdlIPCMoveFile(ipc, filename, newroom, buf);
*/
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 && !IsEmptyStr(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 */
pprintf("%s\n", buf);
return;
}
- while (strlen(resp)) {
+ while (!IsEmptyStr(resp)) {
extract_token(buf, resp, 0, '\n', sizeof buf);
remove_token(resp, 0, '\n');
pprintf("%s\n", buf);
void do_system_configuration(CtdlIPC *ipc)
{
-#define NUM_CONFIGS 50
+#define NUM_CONFIGS 58
- char buf[SIZ];
+ char buf[256];
char sc[NUM_CONFIGS][256];
char *resp = NULL;
struct ExpirePolicy *site_expirepolicy = NULL;
"Allow Aides to Zap (forget) rooms",
atoi(&sc[26][0]))));
- if (strlen(&sc[18][0]) > 0) logpages = 1;
+ if (!IsEmptyStr(&sc[18][0])) logpages = 1;
else logpages = 0;
logpages = boolprompt("Log all pages", logpages);
if (logpages) {
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 */
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
*/
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[44], sizeof sc[44], "%d", (boolprompt(
"Instantly expunge deleted IMAP messages",
atoi(&sc[44][0]))));
&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()) {
}
}
+ if (site_expirepolicy) free(site_expirepolicy);
+ if (mbx_expirepolicy) free(mbx_expirepolicy);
}
keyopt(" <4> directory (Consult the Global Address Book)\n");
keyopt(" <5> SpamAssassin (Address of SpamAssassin server)\n");
keyopt(" <6> RBL (domain suffix of spam hunting RBL)\n");
+ keyopt(" <7> masq domains (Domains as which users are allowed to masquerade)\n");
sel = intprompt("Which one", 1, 1, 6);
switch(sel) {
case 1: strcpy(buf, "localhost");
return;
case 6: strcpy(buf, "rbl");
return;
+ case 7: strcpy(buf, "masqdomain");
+ return;
}
}
*/
void do_internet_configuration(CtdlIPC *ipc)
{
- char buf[SIZ];
+ char buf[256];
char *resp = NULL;
int num_recs = 0;
char **recs = NULL;
r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
if (r / 100 == 1) {
- while (strlen(resp)) {
+ while (!IsEmptyStr(resp)) {
extract_token(buf, resp, 0, '\n', sizeof buf);
remove_token(resp, 0, '\n');
++num_recs;
newprompt("Enter host name: ",
buf, 50);
striplt(buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
++num_recs;
if (num_recs == 1)
recs = malloc(sizeof(char *));
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(resp);
break;
case 'q':
quitting = !modified || boolprompt(
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;
int r;
- if (strlen(editor_paths[0]) == 0) {
+ if (IsEmptyStr(editor_paths[0])) {
scr_printf("You must have an external editor configured in"
" order to use this function.\n");
return;
r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
if (r / 100 == 1) {
- while(listing && strlen(listing)) {
+ while(listing && !IsEmptyStr(listing)) {
extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
extract_token(instr, buf, 0, '|', sizeof instr);
}
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)) {
+ while(listing && !IsEmptyStr(listing)) {
extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
extract_token(instr, buf, 0, '|', sizeof instr);
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) {
if (buf[i] == '#') buf[i] = 0;
}
striplt(buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
fprintf(changefp, "%s|%s\n", entrytype, buf);
}
}
int r;
r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
- if (r / 100 == 1) while (*listing && strlen(listing)) {
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(listing);
break;
case 'q':
quitting = !modified || boolprompt(
int r;
r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
- if (r / 100 == 1) while (*listing && strlen(listing)) {
+ if (r / 100 == 1) while (*listing && !IsEmptyStr(listing)) {
extract_token(buf, listing, 0, '\n', sizeof buf);
remove_token(listing, 0, '\n');
scr_printf("Wrote %d records.\n", num_recs);
modified = 0;
}
+ free(listing);
break;
case 'q':
quitting = !modified || boolprompt(
projects / citadel.git / blobdiff