]> code.citadel.org Git - citadel.git/blobdiff - citadel/routines2.c
- pass -Wcast-qual to gcc
[citadel.git] / citadel / routines2.c
index 7d23e9bb6e97e5495e7c26e1d97813b0a0dd63ed..e66ac3ce0deb2a7256fb6e01e883083ee41a8083 100644 (file)
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
-
-void interr(int errnum);
-void strprompt(char *prompt, char *str, int len);
-void newprompt(char *prompt, char *str, int len);
-void sttybbs(int cmd);
-int inkey(void);
-void serv_write(char *buf, int nbytes);
-int haschar(char *st, int ch);
-void progress(long int curr, long int cmax);
-int yesno(void);
+#include "screen.h"
+#include "client_crypto.h"
 
 extern char temp[];
 extern char tempdir[];
@@ -67,7 +59,7 @@ int eopen(char *name, int mode)
        int ret;
        ret = open(name, mode);
        if (ret < 0) {
-               fprintf(stderr, "Cannot open file '%s', mode=%d, errno=%d\n",
+               err_printf("Cannot open file '%s', mode=%d, errno=%d\n",
                        name, mode, errno);
                interr(errno);
        }
@@ -100,7 +92,11 @@ void entregis(void)
        char tmpphone[SIZ];
        char tmpemail[SIZ];
        char tmpcountry[SIZ];
+       char diruser[SIZ];
+       char dirnode[SIZ];
+       char holdemail[SIZ];
        int a;
+       int ok = 0;
 
        strcpy(tmpname, "");
        strcpy(tmpaddr, "");
@@ -142,13 +138,38 @@ void entregis(void)
        strprompt("ZIP/Postal Code", tmpzip, 10);
        strprompt("Country", tmpcountry, 31);
        strprompt("Telephone number", tmpphone, 14);
-       strprompt("Email address", tmpemail, 31);
+
+       do {
+               ok = 1;
+               strcpy(holdemail, tmpemail);
+               strprompt("Email address", tmpemail, 31);
+               snprintf(buf, sizeof buf, "QDIR %s", tmpemail);
+               serv_puts(buf);
+               serv_gets(buf);
+               if (buf[0]=='2') {
+                       extract_token(diruser, &buf[4], 0, '@');
+                       extract_token(dirnode, &buf[4], 1, '@');
+                       striplt(diruser);
+                       striplt(dirnode);
+                       if ((strcasecmp(diruser, fullname))
+                          || (strcasecmp(dirnode, serv_info.serv_nodename))) {
+                               scr_printf(
+                                       "\nYou can't use %s as your address.\n",
+                                       tmpemail);
+                               scr_printf(
+                                       "It is already in use by %s @ %s.\n",
+                                       diruser, dirnode);
+                               ok = 0;
+                               strcpy(tmpemail, holdemail);
+                       }
+               }
+       } while (ok == 0);
 
        /* now send the registration info back to the server */
        serv_puts("REGI");
        serv_gets(buf);
        if (buf[0] != '4') {
-               printf("%s\n", &buf[4]);
+               scr_printf("%s\n", &buf[4]);
                return;
        }
        serv_puts(tmpname);
@@ -160,16 +181,28 @@ void entregis(void)
        serv_puts(tmpemail);
        serv_puts(tmpcountry);
        serv_puts("000");
-       printf("\n");
+       scr_printf("\n");
 }
 
 void updatels(void)
 {                              /* make all messages old in current room */
        char buf[SIZ];
-       serv_puts("SLRP HIGHEST");
+
+       if (rc_alt_semantics) {
+               if (maxmsgnum == highest_msg_read == 0) {
+                       /* err_printf("maxmsgnum == highest_msg_read == 0\n"); */
+                       return;
+               }
+               snprintf(buf, sizeof(buf), "SLRP %ld",
+                               (maxmsgnum > highest_msg_read) ?
+                                maxmsgnum : highest_msg_read);
+               serv_puts(buf);
+       } else {
+               serv_puts("SLRP HIGHEST");
+       }
        serv_gets(buf);
        if (buf[0] != '2')
-               printf("%s\n", &buf[4]);
+               scr_printf("%s\n", &buf[4]);
 }
 
 /*
@@ -178,11 +211,12 @@ void updatels(void)
 void updatelsa(void)
 {
        char buf[SIZ];
-       sprintf(buf, "SLRP %ld", highest_msg_read);
+
+       snprintf(buf, sizeof buf, "SLRP %ld", highest_msg_read);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2')
-               printf("%s\n", &buf[4]);
+               scr_printf("%s\n", &buf[4]);
 }
 
 
@@ -206,14 +240,14 @@ void do_upload(int fd)
        do {
                bytes_to_send = read(fd, tbuf, 4096);
                if (bytes_to_send > 0) {
-                       sprintf(buf, "WRIT %d", bytes_to_send);
+                       snprintf(buf, sizeof buf, "WRIT %d", bytes_to_send);
                        serv_puts(buf);
                        serv_gets(buf);
                        if (buf[0] == '7') {
                                bytes_expected = atoi(&buf[4]);
                                serv_write(tbuf, bytes_expected);
                        } else {
-                               printf("%s\n", &buf[4]);
+                               scr_printf("%s\n", &buf[4]);
                        }
                }
                transmitted_bytes = transmitted_bytes + (long) bytes_to_send;
@@ -224,7 +258,7 @@ void do_upload(int fd)
        close(fd);
        serv_puts("UCLS 1");
        serv_gets(buf);
-       printf("%s\n", &buf[4]);
+       scr_printf("%s\n", &buf[4]);
 }
 
 
@@ -241,16 +275,16 @@ void cli_upload(void)
        int fd;
 
        if ((room_flags & QR_UPLOAD) == 0) {
-               printf("*** You cannot upload to this room.\n");
+               scr_printf("*** You cannot upload to this room.\n");
                return;
        }
        newprompt("File to be uploaded: ", flnm, 55);
        fd = open(flnm, O_RDONLY);
        if (fd < 0) {
-               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
+               scr_printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
        }
-       printf("Enter a description of this file:\n");
+       scr_printf("Enter a description of this file:\n");
        newprompt(": ", desc, 75);
 
        /* keep generating filenames in hope of finding a unique one */
@@ -261,13 +295,15 @@ void cli_upload(void)
                strcpy(buf, flnm);
                while ((strlen(buf) > 0) && (haschar(buf, '/')))
                        strcpy(buf, &buf[1]);
-               if (a > 0)
-                       sprintf(&buf[strlen(buf)], "%d", a);
-               sprintf(tbuf, "UOPN %s|%s", buf, desc);
+               if (a > 0) {
+                       size_t tmp = strlen(buf);
+                       snprintf(&buf[tmp], sizeof buf - tmp, "%d", a);
+               }
+               snprintf(tbuf, sizeof tbuf, "UOPN %s|%s", buf, desc);
                serv_puts(tbuf);
                serv_gets(buf);
                if (buf[0] != '2')
-                       printf("%s\n", &buf[4]);
+                       scr_printf("%s\n", &buf[4]);
                ++a;
        } while (buf[0] != '2');
 
@@ -285,24 +321,24 @@ void cli_image_upload(char *keyname)
        char buf[SIZ];
        int fd;
 
-       sprintf(buf, "UIMG 0|%s", keyname);
+       snprintf(buf, sizeof buf, "UIMG 0|%s", keyname);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
-               printf("%s\n", &buf[4]);
+               scr_printf("%s\n", &buf[4]);
                return;
        }
        newprompt("Image file to be uploaded: ", flnm, 55);
        fd = open(flnm, O_RDONLY);
        if (fd < 0) {
-               printf("Cannot open '%s': %s\n", flnm, strerror(errno));
+               scr_printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
        }
-       sprintf(buf, "UIMG 1|%s", keyname);
+       snprintf(buf, sizeof buf, "UIMG 1|%s", keyname);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
-               printf("%s\n", &buf[4]);
+               scr_printf("%s\n", &buf[4]);
                return;
        }
        do_upload(fd);
@@ -324,7 +360,7 @@ void upload(int c)
        int fd;
 
        if ((room_flags & QR_UPLOAD) == 0) {
-               printf("*** You cannot upload to this room.\n");
+               scr_printf("*** You cannot upload to this room.\n");
                return;
        }
        /* we don't need a filename when receiving batch y/z modem */
@@ -343,7 +379,7 @@ void upload(int c)
 
        /* create a temporary directory... */
        if (mkdir(tempdir, 0700) != 0) {
-               printf("*** Could not create temporary directory %s: %s\n",
+               scr_printf("*** Could not create temporary directory %s: %s\n",
                       tempdir, strerror(errno));
                return;
        }
@@ -354,30 +390,32 @@ void upload(int c)
                switch (c) {
                case 0:
                        sttybbs(0);
-                       printf("Receiving %s - press Ctrl-D to end.\n", flnm);
+                       scr_printf("Receiving %s - press Ctrl-D to end.\n", flnm);
                        fp = fopen(flnm, "w");
                        do {
                                b = inkey();
                                if (b == 13) {
                                        b = 10;
-                                       printf("\r");
                                }
                                if (b != 4) {
-                                       printf("%c", b);
+                                       scr_printf("%c", b);
                                        putc(b, fp);
                                }
                        } while (b != 4);
                        fclose(fp);
                        exit(0);
                case 1:
+                       screen_reset();
                        sttybbs(3);
                        execlp("rx", "rx", flnm, NULL);
                        exit(1);
                case 2:
+                       screen_reset();
                        sttybbs(3);
                        execlp("rb", "rb", NULL);
                        exit(1);
                case 3:
+                       screen_reset();
                        sttybbs(3);
                        execlp("rz", "rz", NULL);
                        exit(1);
@@ -387,27 +425,31 @@ void upload(int c)
                        b = ka_wait(&a);
                } while ((b != xfer_pid) && (b != (-1)));
        sttybbs(0);
+       screen_set();
 
        if (a != 0) {
-               printf("\r*** Transfer unsuccessful.\n");
+               scr_printf("\r*** Transfer unsuccessful.\n");
                nukedir(tempdir);
                return;
        }
-       printf("\r*** Transfer successful.  Sending file(s) to server...\n");
-       sprintf(buf, "cd %s; ls", tempdir);
+       scr_printf("\r*** Transfer successful.  Sending file(s) to server...\n");
+       snprintf(buf, sizeof buf, "cd %s; ls", tempdir);
        lsfp = popen(buf, "r");
        if (lsfp != NULL) {
                while (fgets(flnm, sizeof flnm, lsfp) != NULL) {
                        flnm[strlen(flnm) - 1] = 0;
-                       sprintf(buf, "%s/%s", tempdir, flnm);
+                       snprintf(buf, sizeof buf, "%s/%s", tempdir, flnm);
                        fd = open(buf, O_RDONLY);
                        if (fd >= 0) {
                                a = 0;
                                do {
-                                       sprintf(buf, "UOPN %s|%s", flnm, desc);
-                                       if (a > 0)
-                                               sprintf(&buf[strlen(buf)],
+                                       snprintf(buf, sizeof buf, "UOPN %s|%s", flnm, desc);
+                                       if (a > 0) {
+                                               size_t tmp = strlen(buf);
+                                               snprintf(&buf[tmp],
+                                                       sizeof buf - tmp,
                                                        ".%d", a);
+                                       }
                                        ++a;
                                        serv_puts(buf);
                                        serv_gets(buf);
@@ -416,7 +458,7 @@ void upload(int c)
                                        do {
                                                a = read(fd, tbuf, 4096);
                                                if (a > 0) {
-                                                       sprintf(buf, "WRIT %d", a);
+                                                       snprintf(buf, sizeof buf, "WRIT %d", a);
                                                        serv_puts(buf);
                                                        serv_gets(buf);
                                                        if (buf[0] == '7')
@@ -426,7 +468,7 @@ void upload(int c)
                                close(fd);
                                serv_puts("UCLS 1");
                                serv_gets(buf);
-                               printf("%s\n", &buf[4]);
+                               scr_printf("%s\n", &buf[4]);
                        }
                }
                pclose(lsfp);
@@ -444,7 +486,7 @@ void val_user(char *user, int do_validate)
        char buf[SIZ];
        int ax = 0;
 
-       sprintf(cmd, "GREG %s", user);
+       snprintf(cmd, sizeof cmd, "GREG %s", user);
        serv_puts(cmd);
        serv_gets(cmd);
        if (cmd[0] == '1') {
@@ -453,43 +495,43 @@ void val_user(char *user, int do_validate)
                        serv_gets(buf);
                        ++a;
                        if (a == 1)
-                               printf("User #%s - %s  ", buf, &cmd[4]);
+                               scr_printf("User #%s - %s  ", buf, &cmd[4]);
                        if (a == 2)
-                               printf("PW: %s\n", buf);
+                               scr_printf("PW: %s\n", buf);
                        if (a == 3)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                        if (a == 4)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                        if (a == 5)
-                               printf("%s, ", buf);
+                               scr_printf("%s, ", buf);
                        if (a == 6)
-                               printf("%s ", buf);
+                               scr_printf("%s ", buf);
                        if (a == 7)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                        if (a == 8)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                        if (a == 9)
                                ax = atoi(buf);
                        if (a == 10)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                        if (a == 11)
-                               printf("%s\n", buf);
+                               scr_printf("%s\n", buf);
                } while (strcmp(buf, "000"));
-               printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
+               scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
        } else {
-               printf("%-30s\n%s\n", user, &cmd[4]);
+               scr_printf("%-30s\n%s\n", user, &cmd[4]);
        }
 
        if (do_validate) {
                /* now set the access level */
                ax = intprompt("Access level", ax, 0, 6);
-               sprintf(cmd, "VALI %s|%d", user, ax);
+               snprintf(cmd, sizeof cmd, "VALI %s|%d", user, ax);
                serv_puts(cmd);
                serv_gets(cmd);
                if (cmd[0] != '2')
-                       printf("%s\n", &cmd[4]);
+                       scr_printf("%s\n", &cmd[4]);
        }
-       printf("\n");
+       scr_printf("\n");
 }
 
 
@@ -505,7 +547,7 @@ void validate(void)
                if (cmd[0] != '3')
                        finished = 1;
                if (cmd[0] == '2')
-                       printf("%s\n", &cmd[4]);
+                       scr_printf("%s\n", &cmd[4]);
                if (cmd[0] == '3') {
                        extract(buf, cmd, 0);
                        val_user(&buf[4], 1);
@@ -518,17 +560,19 @@ void subshell(void)
        int a, b;
        a = fork();
        if (a == 0) {
+               screen_reset();
                sttybbs(SB_RESTORE);
                signal(SIGINT, SIG_DFL);
                signal(SIGQUIT, SIG_DFL);
                execlp(getenv("SHELL"), getenv("SHELL"), NULL);
-               printf("Could not open a shell: %s\n", strerror(errno));
+               err_printf("Could not open a shell: %s\n", strerror(errno));
                exit(errno);
        }
        do {
                b = ka_wait(NULL);
        } while ((a != b) && (a != (-1)));
        sttybbs(0);
+       screen_set();
 }
 
 /*
@@ -542,10 +586,10 @@ void deletefile(void)
        newprompt("Filename: ", filename, 31);
        if (strlen(filename) == 0)
                return;
-       sprintf(cmd, "DELF %s", filename);
+       snprintf(cmd, sizeof cmd, "DELF %s", filename);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n", &cmd[4]);
+       err_printf("%s\n", &cmd[4]);
 }
 
 /*
@@ -559,10 +603,10 @@ void netsendfile(void)
        if (strlen(filename) == 0)
                return;
        newprompt("System to send to: ", destsys, 19);
-       sprintf(cmd, "NETF %s|%s", filename, destsys);
+       snprintf(cmd, sizeof cmd, "NETF %s|%s", filename, destsys);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n", &cmd[4]);
+       err_printf("%s\n", &cmd[4]);
        return;
 }
 
@@ -580,10 +624,10 @@ void movefile(void)
                return;
        newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
 
-       sprintf(cmd, "MOVF %s|%s", filename, newroom);
+       snprintf(cmd, sizeof cmd, "MOVF %s|%s", filename, newroom);
        serv_puts(cmd);
        serv_gets(cmd);
-       printf("%s\n", &cmd[4]);
+       err_printf("%s\n", &cmd[4]);
 }
 
 
@@ -627,7 +671,7 @@ void read_bio(void)
                if (!strcmp(who, "?"))
                        list_bio();
        } while (!strcmp(who, "?"));
-       sprintf(buf, "RBIO %s", who);
+       snprintf(buf, sizeof buf, "RBIO %s", who);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '1') {
@@ -646,7 +690,7 @@ void read_bio(void)
 void do_system_configuration(void)
 {
        char buf[SIZ];
-       char sc[28][SIZ];
+       char sc[30][SIZ];
        int expire_mode = 0;
        int expire_value = 0;
        int a;
@@ -661,8 +705,9 @@ void do_system_configuration(void)
        if (buf[0] == '1') {
                a = 0;
                while (serv_gets(buf), strcmp(buf, "000")) {
-                       if (a < 28)
+                       if (a < 30) {
                                strcpy(&sc[a][0], buf);
+                       }
                        ++a;
                }
        }
@@ -686,28 +731,34 @@ void do_system_configuration(void)
        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);
-       /* strprompt("Default moderation filter for new users", &sc[25][0], 4); */
+
+       /* this prompt is commented out until we finish the moderation system
+       strprompt("Default moderation filter for new users", &sc[25][0], 4);
+       */
 
        /* Security parameters */
 
-       sprintf(&sc[7][0], "%d", (boolprompt(
+       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);
-       sprintf(&sc[4][0], "%d", (boolprompt(
+       snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
                                                    "Automatically give room aide privs to a user who creates a private room",
                                                    atoi(&sc[4][0]))));
 
-       sprintf(&sc[8][0], "%d", (boolprompt(
+       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);
-       sprintf(&sc[11][0], "%d", (boolprompt(
+       snprintf(sc[11], sizeof sc[11], "%d", (boolprompt(
              "Restrict Internet mail to only those with that privilege",
                                                     atoi(&sc[11][0]))));
-       sprintf(&sc[26][0], "%d", (boolprompt(
+       snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
              "Allow Aides to Zap (forget) rooms",
                                                     atoi(&sc[26][0]))));
 
@@ -729,48 +780,52 @@ void do_system_configuration(void)
        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);
+
+       /* no longer applicable ... deprecated
        strprompt("Server-to-server networking password", &sc[15][0], 19);
+       */
+
+       strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
        strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
        strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
        strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
 
-
        /* 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... */
        do {
-               sprintf(buf, "%d", expire_mode);
+               snprintf(buf, sizeof buf, "%d", expire_mode);
                strprompt("System default message expire policy (? for list)",
                          buf, 1);
                if (buf[0] == '?') {
-                       printf("\n");
-                       printf("1. Never automatically expire messages\n");
-                       printf("2. Expire by message count\n");
-                       printf("3. Expire by message age\n");
+                       scr_printf("\n"
+                               "1. Never automatically expire messages\n"
+                               "2. Expire by message count\n"
+                               "3. Expire by message age\n");
                }
        } while ((buf[0] < 49) || (buf[0] > 51));
        expire_mode = buf[0] - 48;
 
        /* ...lunatics and monsters underneath my bed */
        if (expire_mode == 2) {
-               sprintf(buf, "%d", expire_value);
+               snprintf(buf, sizeof buf, "%d", expire_value);
                strprompt("Keep how many messages online?", buf, 10);
                expire_value = atol(buf);
        }
        if (expire_mode == 3) {
-               sprintf(buf, "%d", expire_value);
+               snprintf(buf, sizeof buf, "%d", expire_value);
                strprompt("Keep messages for how many days?", buf, 10);
                expire_value = atol(buf);
        }
        /* Save it */
-       printf("Save this configuration? ");
+       scr_printf("Save this configuration? ");
        if (yesno()) {
                serv_puts("CONF set");
                serv_gets(buf);
                if (buf[0] == '4') {
-                       for (a = 0; a < 28; ++a)
+                       for (a = 0; a < 30; ++a)
                                serv_puts(&sc[a][0]);
                        serv_puts("000");
                }
@@ -788,10 +843,11 @@ void do_system_configuration(void)
 void get_inet_rec_type(char *buf) {
        int sel;
 
-       keyopt(" <1> localhost       (Alias for this computer)\n");
-       keyopt(" <2> gateway domain  (Domain for all Citadel systems)\n");
-       keyopt(" <3> smart-host      (Forward all outbound mail to this host)\n");
-       sel = intprompt("Which one", 1, 1, 3);
+       keyopt(" <1> localhost      (Alias for this computer)\n");
+       keyopt(" <2> gateway domain (Domain for all Citadel systems)\n");
+       keyopt(" <3> smart-host     (Forward all outbound mail to this host)\n");
+       keyopt(" <4> directory      (Consult the Global Address Book)\n");
+       sel = intprompt("Which one", 1, 1, 4);
        switch(sel) {
                case 1: strcpy(buf, "localhost");
                        return;
@@ -799,6 +855,8 @@ void get_inet_rec_type(char *buf) {
                        return;
                case 3: strcpy(buf, "smarthost");
                        return;
+               case 4: strcpy(buf, "directory");
+                       return;
        }
 }
 
@@ -816,7 +874,7 @@ void do_internet_configuration(void) {
        int quitting = 0;
        
 
-       sprintf(buf, "CONF getsys|%s", INTERNETCFG);
+       snprintf(buf, sizeof buf, "CONF getsys|%s", INTERNETCFG);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
@@ -828,24 +886,20 @@ void do_internet_configuration(void) {
        }
 
        do {
-               printf("\n");
+               scr_printf("\n");
                color(BRIGHT_WHITE);
-               printf("### ");
-               printf("                   Host or domain                  ");
-               printf("   Record type      \n");
+               scr_printf("###                    Host or domain                     Record type      \n");
                color(DIM_WHITE);
-               printf("--- ");
-               printf("-------------------------------------------------- ");
-               printf("--------------------\n");
+               scr_printf("--- -------------------------------------------------- --------------------\n");
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
-               printf("%3d ", i+1);
+               scr_printf("%3d ", i+1);
                extract(buf, recs[i], 0);
                color(BRIGHT_CYAN);
-               printf("%-50s ", buf);
+               scr_printf("%-50s ", buf);
                extract(buf, recs[i], 1);
                color(BRIGHT_MAGENTA);
-               printf("%-20s\n", buf);
+               scr_printf("%-20s\n", buf);
                color(DIM_WHITE);
                }
 
@@ -872,7 +926,7 @@ void do_internet_configuration(void) {
                                        recs[j] = recs[j+1];
                                break;
                        case 's':
-                               sprintf(buf, "CONF putsys|%s",
+                               snprintf(buf, sizeof buf, "CONF putsys|%s",
                                        INTERNETCFG);
                                serv_puts(buf);
                                serv_gets(buf);
@@ -883,7 +937,7 @@ void do_internet_configuration(void) {
                                        serv_puts("000");
                                }
                                else {
-                                       printf("%s\n", &buf[4]);
+                                       scr_printf("%s\n", &buf[4]);
                                }
                                quitting = 1;
                                break;
@@ -921,8 +975,8 @@ void network_config_management(char *entrytype, char *comment) {
        FILE *changefp;
 
        if (strlen(editor_path) == 0) {
-               printf("You must have an external editor configured in order"
-                       " to use this function.\n");
+               scr_printf("You must have an external editor configured in"
+                       " order to use this function.\n");
                return;
        }
 
@@ -931,7 +985,7 @@ void network_config_management(char *entrytype, char *comment) {
 
        tempfp = fopen(filename, "w");
        if (tempfp == NULL) {
-               printf("Cannot open %s: %s\n", filename, strerror(errno));
+               err_printf("Cannot open %s: %s\n", filename, strerror(errno));
                return;
        }
 
@@ -958,7 +1012,9 @@ void network_config_management(char *entrytype, char *comment) {
        cksum = file_checksum(filename);
        if (editor_pid == 0) {
                chmod(filename, 0600);
+               screen_reset();
                sttybbs(SB_RESTORE);
+               putenv("WINDOW_TITLE=Network configuration");
                execlp(editor_path, editor_path, filename, NULL);
                exit(1);
        }
@@ -969,10 +1025,11 @@ void network_config_management(char *entrytype, char *comment) {
                } while ((b != editor_pid) && (b >= 0));
        editor_pid = (-1);
        sttybbs(0);
+       screen_set();
        }
 
        if (file_checksum(filename) == cksum) {
-               printf("*** Not saving changes.\n");
+               err_printf("*** Not saving changes.\n");
                e_ex_code = 1;
        }
 
@@ -1036,7 +1093,7 @@ void do_ignet_configuration(void) {
        int quitting = 0;
        
 
-       sprintf(buf, "CONF getsys|%s", IGNETCFG);
+       snprintf(buf, sizeof buf, "CONF getsys|%s", IGNETCFG);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
@@ -1048,34 +1105,34 @@ void do_ignet_configuration(void) {
        }
 
        do {
-               printf("\n");
+               scr_printf("\n");
                color(BRIGHT_WHITE);
-               printf( "### "
+               scr_printf(     "### "
                        "   Node          "
-                       "  Secret         "
+                       "  Secret           "
                        "          Host or IP             "
                        "Port#\n");
                color(DIM_WHITE);
-               printf( "--- "
-                       "---------------- "
+               scr_printf(     "--- "
                        "---------------- "
+                       "------------------ "
                        "-------------------------------- "
                        "-----\n");
                for (i=0; i<num_recs; ++i) {
                color(DIM_WHITE);
-               printf("%3d ", i+1);
+               scr_printf("%3d ", i+1);
                extract(buf, recs[i], 0);
                color(BRIGHT_CYAN);
-               printf("%-16s ", buf);
+               scr_printf("%-16s ", buf);
                extract(buf, recs[i], 1);
                color(BRIGHT_MAGENTA);
-               printf("%-16s ", buf);
+               scr_printf("%-18s ", buf);
                extract(buf, recs[i], 2);
                color(BRIGHT_CYAN);
-               printf("%-32s ", buf);
+               scr_printf("%-32s ", buf);
                extract(buf, recs[i], 3);
                color(BRIGHT_MAGENTA);
-               printf("%-3s\n", buf);
+               scr_printf("%-3s\n", buf);
                color(DIM_WHITE);
                }
 
@@ -1090,7 +1147,7 @@ void do_ignet_configuration(void) {
                                newprompt("Enter node name    : ", buf, 16);
                                strcat(buf, "|");
                                newprompt("Enter shared secret: ",
-                                       &buf[strlen(buf)], 16);
+                                       &buf[strlen(buf)], 18);
                                strcat(buf, "|");
                                newprompt("Enter host or IP   : ",
                                        &buf[strlen(buf)], 32);
@@ -1108,7 +1165,117 @@ void do_ignet_configuration(void) {
                                        recs[j] = recs[j+1];
                                break;
                        case 's':
-                               sprintf(buf, "CONF putsys|%s", IGNETCFG);
+                               snprintf(buf, sizeof buf, "CONF putsys|%s", IGNETCFG);
+                               serv_puts(buf);
+                               serv_gets(buf);
+                               if (buf[0] == '4') {
+                                       for (i=0; i<num_recs; ++i) {
+                                               serv_puts(recs[i]);
+                                       }
+                                       serv_puts("000");
+                               }
+                               else {
+                                       scr_printf("%s\n", &buf[4]);
+                               }
+                               quitting = 1;
+                               break;
+                       case 'q':
+                               quitting = boolprompt(
+                                       "Quit without saving", 0);
+                               break;
+                       default:
+                               badkey = 1;
+               }
+       } while (quitting == 0);
+
+       if (recs != NULL) {
+               for (i=0; i<num_recs; ++i) free(recs[i]);
+               free(recs);
+       }
+}
+
+/*
+ * Filter list configuration
+ */
+void do_filterlist_configuration(void) {
+       char buf[SIZ];
+       int num_recs = 0;
+       char **recs = NULL;
+       char ch;
+       int badkey;
+       int i, j;
+       int quitting = 0;
+       
+
+       snprintf(buf, sizeof buf, "CONF getsys|%s", FILTERLIST);
+       serv_puts(buf);
+       serv_gets(buf);
+       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+               ++num_recs;
+               if (num_recs == 1) recs = malloc(sizeof(char *));
+               else recs = realloc(recs, (sizeof(char *)) * num_recs);
+               recs[num_recs-1] = malloc(SIZ);
+               strcpy(recs[num_recs-1], buf);
+       }
+
+       do {
+               scr_printf("\n");
+               color(BRIGHT_WHITE);
+               scr_printf(     "### "
+                       "         User name           "
+                       "         Room name           "
+                       "    Node name    "
+                       "\n");
+               color(DIM_WHITE);
+               scr_printf(     "--- "
+                       "---------------------------- "
+                       "---------------------------- "
+                       "---------------- "
+                       "\n");
+               for (i=0; i<num_recs; ++i) {
+               color(DIM_WHITE);
+               scr_printf("%3d ", i+1);
+               extract(buf, recs[i], 0);
+               color(BRIGHT_CYAN);
+               scr_printf("%-28s ", buf);
+               extract(buf, recs[i], 1);
+               color(BRIGHT_MAGENTA);
+               scr_printf("%-28s ", buf);
+               extract(buf, recs[i], 2);
+               color(BRIGHT_CYAN);
+               scr_printf("%-16s\n", buf);
+               extract(buf, recs[i], 3);
+               color(DIM_WHITE);
+               }
+
+               ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
+               switch(ch) {
+                       case 'a':
+                               ++num_recs;
+                               if (num_recs == 1)
+                                       recs = malloc(sizeof(char *));
+                               else recs = realloc(recs,
+                                       (sizeof(char *)) * num_recs);
+                               newprompt("Enter user name: ", buf, 28);
+                               strcat(buf, "|");
+                               newprompt("Enter room name: ",
+                                       &buf[strlen(buf)], 28);
+                               strcat(buf, "|");
+                               newprompt("Enter node name: ",
+                                       &buf[strlen(buf)], 16);
+                               strcat(buf, "|");
+                               recs[num_recs-1] = strdup(buf);
+                               break;
+                       case 'd':
+                               i = intprompt("Delete which one",
+                                       1, 1, num_recs) - 1;
+                               free(recs[i]);
+                               --num_recs;
+                               for (j=i; j<num_recs; ++j)
+                                       recs[j] = recs[j+1];
+                               break;
+                       case 's':
+                               snprintf(buf, sizeof buf, "CONF putsys|%s", FILTERLIST);
                                serv_puts(buf);
                                serv_gets(buf);
                                if (buf[0] == '4') {
@@ -1118,7 +1285,7 @@ void do_ignet_configuration(void) {
                                        serv_puts("000");
                                }
                                else {
-                                       printf("%s\n", &buf[4]);
+                                       scr_printf("%s\n", &buf[4]);
                                }
                                quitting = 1;
                                break;