Implemented configuration settings for journaling.
[citadel.git] / citadel / routines2.c
index 9e39b825e308a33be16b6983c44755a6960dc34e..f20add33f8a18c3f2e24fa83974345c216879f65 100644 (file)
@@ -1,6 +1,8 @@
-/* More Citadel/UX routines...
- * unlike routines.c, some of these DO use global variables.
- * $Id$
+/* $Id$
+ *
+ * More client-side support functions.
+ * Unlike routines.c, some of these DO use global variables.
+ *
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
+#include <limits.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <signal.h>
 #include <pwd.h>
-#include <setjmp.h>
 #include <errno.h>
+#include <stdarg.h>
+#include "sysdep.h"
 #include "citadel.h"
+#include "citadel_ipc.h"
+#include "citadel_decls.h"
 #include "routines2.h"
 #include "routines.h"
 #include "commands.h"
-
-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);
-int ka_wait(pid_t *kstatus);
-void serv_write(char *buf, int nbytes);
-void extract(char *dest, char *source, int parmnum);
-int haschar(char *st, int ch);
-void progress(long int curr, long int cmax);
-void citedit(FILE *fp, long int base_pos);
-int yesno(void);
+#include "tools.h"
+#include "messages.h"
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+#include "screen.h"
+
+/* work around solaris include files */
+#ifdef reg
+#undef reg
+#endif
 
 extern char temp[];
 extern char tempdir[];
@@ -43,641 +58,1366 @@ extern unsigned room_flags;
 extern int screenwidth;
 
 
+/*
 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",
-                       name,mode,errno);
+       ret = open(name, mode);
+       if (ret < 0) {
+               err_printf("Cannot open file '%s', mode=%d, errno=%d\n",
+                       name, mode, errno);
                interr(errno);
-               }
-       return(ret);
        }
+       return (ret);
+}
+*/
 
 
-int room_prompt(int qrflags)   /* return proper room prompt character */
-             {
+int room_prompt(unsigned int qrflags)
+{                              /* return proper room prompt character */
        int a;
-       a='>';
-       if (qrflags&QR_DIRECTORY) a=']';
-       if ((a==']')&&(qrflags&QR_NETWORK)) a='}';
-       if ((a=='>')&&(qrflags&QR_NETWORK)) a=')';
-       return(a);
-       }
-
-void entregis(void)    /* register with name and address */
-       {
-
-       char buf[256];
-       char tmpname[256];
-       char tmpaddr[256];
-       char tmpcity[256];
-       char tmpstate[256];
-       char tmpzip[256];
-       char tmpphone[256];
-       char tmpemail[256];
-       int a;
-
-       strcpy(tmpname,"");
-       strcpy(tmpaddr,"");
-       strcpy(tmpcity,"");
-       strcpy(tmpstate,"");
-       strcpy(tmpzip,"");
-       strcpy(tmpphone,"");
-       strcpy(tmpemail,"");
-
-       serv_puts("GREG _SELF_");
-       serv_gets(buf);
-       if (buf[0]=='1') {
-               a = 0;
-               while (serv_gets(buf), strcmp(buf,"000")) {
-                       if (a==2) strcpy(tmpname,buf);
-                       if (a==3) strcpy(tmpaddr,buf);
-                       if (a==4) strcpy(tmpcity,buf);
-                       if (a==5) strcpy(tmpstate,buf);
-                       if (a==6) strcpy(tmpzip,buf);
-                       if (a==7) strcpy(tmpphone,buf);
-                       if (a==9) strcpy(tmpemail,buf);
+       a = '>';
+       if (qrflags & QR_DIRECTORY)
+               a = ']';
+       if ((a == ']') && (qrflags & QR_NETWORK))
+               a = '}';
+       if ((a == '>') && (qrflags & QR_NETWORK))
+               a = ')';
+       return (a);
+}
+
+void entregis(CtdlIPC *ipc)
+{                              /* register with name and address */
+
+       char buf[SIZ];
+       char tmpname[30];
+       char tmpaddr[25];
+       char tmpcity[15];
+       char tmpstate[3];
+       char tmpzip[11];
+       char tmpphone[15];
+       char tmpemail[SIZ];
+       char tmpcountry[32];
+       char diruser[256];
+       char dirnode[256];
+       char holdemail[SIZ];
+       char *reg = NULL;
+       int ok = 0;
+       int r;                          /* IPC response code */
+
+       strcpy(tmpname, "");
+       strcpy(tmpaddr, "");
+       strcpy(tmpcity, "");
+       strcpy(tmpstate, "");
+       strcpy(tmpzip, "");
+       strcpy(tmpphone, "");
+       strcpy(tmpemail, "");
+       strcpy(tmpcountry, "");
+
+       r = CtdlIPCGetUserRegistration(ipc, NULL, &reg, buf);
+       if (r / 100 == 1) {
+               int a = 0;
+
+               while (reg && strlen(reg) > 0) {
+
+                       extract_token(buf, reg, 0, '\n', sizeof buf);
+                       remove_token(reg, 0, '\n');
+
+                       if (a == 2)
+                               safestrncpy(tmpname, buf, sizeof tmpname);
+                       else if (a == 3)
+                               safestrncpy(tmpaddr, buf, sizeof tmpaddr);
+                       else if (a == 4)
+                               safestrncpy(tmpcity, buf, sizeof tmpcity);
+                       else if (a == 5)
+                               safestrncpy(tmpstate, buf, sizeof tmpstate);
+                       else if (a == 6)
+                               safestrncpy(tmpzip, buf, sizeof tmpzip);
+                       else if (a == 7)
+                               safestrncpy(tmpphone, buf, sizeof tmpphone);
+                       else if (a == 9)
+                               safestrncpy(tmpemail, buf, sizeof tmpemail);
+                       else if (a == 10)
+                               safestrncpy(tmpcountry, buf, sizeof tmpcountry);
                        ++a;
-                       }
                }
+       }
+       strprompt("REAL name", tmpname, 29);
+       strprompt("Address", tmpaddr, 24);
+       strprompt("City/town", tmpcity, 14);
+       strprompt("State/province", tmpstate, 2);
+       strprompt("ZIP/Postal Code", tmpzip, 10);
+       strprompt("Country", tmpcountry, 31);
+       strprompt("Telephone number", tmpphone, 14);
 
-       strprompt("REAL name",tmpname,29);
-       strprompt("Address",tmpaddr,24);
-       strprompt("City/town",tmpcity,14);
-       strprompt("State",tmpstate,2);
-       strprompt("ZIP Code",tmpzip,10);
-       strprompt("Telephone number",tmpphone,14);
-       strprompt("Email address",tmpemail,31);
+       do {
+               ok = 1;
+               safestrncpy(holdemail, tmpemail, sizeof holdemail);
+               strprompt("Email address", tmpemail, 31);
+               r = CtdlIPCDirectoryLookup(ipc, tmpemail, buf);
+               if (r / 100 == 2) {
+                       extract_token(diruser, buf, 0, '@', sizeof diruser);
+                       extract_token(dirnode, buf, 1, '@', sizeof dirnode);
+                       striplt(diruser);
+                       striplt(dirnode);
+                       if ((strcasecmp(diruser, fullname))
+                          || (strcasecmp(dirnode, ipc->ServInfo.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;
+                               safestrncpy(tmpemail, holdemail, sizeof tmpemail);
+                       }
+               }
+       } 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]);
-               return;
-               }
-       serv_puts(tmpname);
-       serv_puts(tmpaddr);
-       serv_puts(tmpcity);
-       serv_puts(tmpstate);
-       serv_puts(tmpzip);
-       serv_puts(tmpphone);
-       serv_puts(tmpemail);
-       serv_puts("000");
-       printf("\n");
+       reg = (char *)realloc(reg, SIZ);
+       if (reg) {
+               sprintf(reg, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+                       tmpname, tmpaddr, tmpcity, tmpstate,
+                       tmpzip, tmpphone, tmpemail, tmpcountry);
+               r = CtdlIPCSetRegistration(ipc, reg, buf);
+               if (r / 100 != 4)
+                       scr_printf("%s\n", buf);
+               free(reg);
        }
+       scr_printf("\n");
+}
 
-void updatels(void) {  /* make all messages old in current room */
-       char buf[256];
-       serv_puts("SLRP HIGHEST");
-       serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
-       }
+void updatels(CtdlIPC *ipc)
+{                              /* make all messages old in current room */
+       char buf[SIZ];
+       int r;                          /* IPC response code */
 
-void updatelsa(void) {   /* only make messages old in this room that have been read */
-       char buf[256];
-       sprintf(buf,"SLRP %ld",highest_msg_read);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0]!='2') printf("%s\n",&buf[4]);
+       if (rc_alt_semantics) {
+               if (maxmsgnum == 0 && highest_msg_read == 0) {
+                       return;
+               }
+               r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+                                maxmsgnum : highest_msg_read, buf);
+       } else {
+               r = CtdlIPCSetLastRead(ipc, (maxmsgnum > highest_msg_read) ?
+                                maxmsgnum : highest_msg_read, buf);
+/*             r = CtdlIPCSetLastRead(ipc, maxmsgnum, buf); */
+/* This is a quick-and-dirty fix to all msgs becoming new in Mail>.
+ * It will need to be rethought when messages.c is rewritten.
+ */
        }
-
+       if (r / 100 != 2)
+               scr_printf("%s\n", buf);
+}
 
 /*
- * This routine completes a client upload
+ * only make messages old in this room that have been read
  */
-void do_upload(int fd) {
-       char buf[256];
-       char tbuf[4096];
-       long transmitted_bytes, total_bytes;
-       int bytes_to_send;
-       int bytes_expected;
-
-       /* learn the size of the file */
-       total_bytes = lseek(fd,0L,2);
-       lseek(fd,0L,0);
-
-       transmitted_bytes = 0L;
-       progress(transmitted_bytes,total_bytes);
-       do {
-               bytes_to_send = read(fd,tbuf,4096);
-               if (bytes_to_send>0) {
-                       sprintf(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]);
-                               }
-                       }
-               transmitted_bytes = transmitted_bytes + (long)bytes_to_send;
-               progress(transmitted_bytes, total_bytes);
-               } while (bytes_to_send > 0);
+void updatelsa(CtdlIPC *ipc)
+{
+       char buf[SIZ];
+       int r;                          /* IPC response code */
 
-       /* close the upload file, locally and at the server */
-       close(fd);
-       serv_puts("UCLS 1");
-       serv_gets(buf);
-       printf("%s\n",&buf[4]);
-       }
+       r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
+       if (r / 100 != 2)
+               scr_printf("%s\n", &buf[4]);
+}
 
 
 /*
  * client-based uploads (for users with their own clientware)
  */
-void cli_upload(void) {
-       char flnm[256];
+void cli_upload(CtdlIPC *ipc)
+{
+       char flnm[SIZ];
        char desc[151];
-       char buf[256];
-       char tbuf[256];
+       char buf[SIZ];
+       char tbuf[SIZ];
+       int r;          /* IPC response code */
        int a;
        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));
+       }
+       newprompt("File to be uploaded: ", flnm, 55);
+       fd = open(flnm, O_RDONLY);
+       if (fd < 0) {
+               scr_printf("Cannot open '%s': %s\n", flnm, strerror(errno));
                return;
-               }
-       printf("Enter a description of this file:\n");
-       newprompt(": ",desc,75);
+       }
+       scr_printf("Enter a description of this file:\n");
+       newprompt(": ", desc, 75);
 
-       /* keep generating filenames in hope of finding a unique one */
+       /* Keep generating filenames in hope of finding a unique one */
        a = 0;
-       do {
-               if (a==10) return; /* fail if tried 10 times */
-               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);
-               serv_puts(tbuf);
-               serv_gets(buf);
-               if (buf[0]!='2') printf("%s\n",&buf[4]);
+       while (a < 10) {
+               /* basename of filename */
+               strcpy(tbuf, flnm);
+               if (haschar(tbuf, '/'))
+                       extract_token(tbuf, flnm,
+                               num_tokens(tbuf, '/') - 1,
+                               '/', sizeof tbuf
+                       );
+               /* filename.1, filename.2, etc */
+               if (a > 0) {
+                       sprintf(&tbuf[strlen(tbuf)], ".%d", a);
+               }
+               /* Try upload */
+               r = CtdlIPCFileUpload(ipc, tbuf, desc, flnm, progress, buf);
+               if (r / 100 == 5 || r < 0)
+                       scr_printf("%s\n", buf);
+               else
+                       break;
                ++a;
-               } while (buf[0]!='2');
-
-       /* at this point we have an open upload file at the server */
-       do_upload(fd);
        }
+       if (a > 0) scr_printf("Saved as '%s'\n", tbuf);
+}
 
 
 /*
  * Function used for various image upload commands
  */
-void cli_image_upload(char *keyname) {
-       char flnm[256];
-       char buf[256];
-       int fd;
-
-       sprintf(buf, "UIMG 0|%s", keyname);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0] != '2') {
-               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));
-               return;
-               }
-
-       sprintf(buf, "UIMG 1|%s", keyname);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0] != '2') {
-               printf("%s\n", &buf[4]);
+void cli_image_upload(CtdlIPC *ipc, char *keyname)
+{
+       char flnm[SIZ];
+       char buf[SIZ];
+       int r;
+
+       /* Can we upload this image? */
+       r = CtdlIPCImageUpload(ipc, 0, NULL, keyname, NULL, buf);
+       if (r / 100 != 2) {
+               err_printf("%s\n", buf);
                return;
-               }
-
-       do_upload(fd);
        }
+       newprompt("Image file to be uploaded: ", flnm, 55);
+       r = CtdlIPCImageUpload(ipc, 1, flnm, keyname, progress, buf);
+       if (r / 100 == 5) {
+               err_printf("%s\n", buf);
+       } else if (r < 0) {
+               err_printf("Cannot upload '%s': %s\n", flnm, strerror(errno));
+       }
+       /* else upload succeeded */
+}
 
 
 /*
  * protocol-based uploads (Xmodem, Ymodem, Zmodem)
  */
-void upload(int c)     /* c = upload mode */
-       {
-       char flnm[256];
+void upload(CtdlIPC *ipc, int c)
+{                              /* c = upload mode */
+       char flnm[SIZ];
        char desc[151];
-       char buf[256];
+       char buf[SIZ];
        char tbuf[4096];
        int xfer_pid;
-       int a,b;
-       FILE *fp,*lsfp;
-       int fd;
+       int a, b;
+       FILE *fp, *lsfp;
+       int r;
 
        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 */
-       if ((c==2)||(c==3)) strcpy(flnm,"x");
-       else newprompt("Enter filename: ",flnm,15);
+       if ((c == 2) || (c == 3))
+               strcpy(flnm, "x");
+       else
+               newprompt("Enter filename: ", flnm, 15);
 
-       for (a=0; a<strlen(flnm); ++a)
-               if ( (flnm[a]=='/') || (flnm[a]=='\\') || (flnm[a]=='>')
-                    || (flnm[a]=='?') || (flnm[a]=='*')
-                    || (flnm[a]==';') || (flnm[a]=='&') ) flnm[a]='_';
-
-       newprompt("Enter a short description of the file:\n: ",desc,150);
+       for (a = 0; a < strlen(flnm); ++a)
+               if ((flnm[a] == '/') || (flnm[a] == '\\') || (flnm[a] == '>')
+                   || (flnm[a] == '?') || (flnm[a] == '*')
+                   || (flnm[a] == ';') || (flnm[a] == '&'))
+                       flnm[a] = '_';
 
        /* create a temporary directory... */
-       if (mkdir(tempdir,0700) != 0) {
-               printf("*** Could not create temporary directory %s: %s\n",
-                       tempdir,strerror(errno));
+       if (mkdir(tempdir, 0700) != 0) {
+               scr_printf("*** Could not create temporary directory %s: %s\n",
+                      tempdir, strerror(errno));
                return;
-               }
-
+       }
        /* now do the transfer ... in a separate process */
        xfer_pid = fork();
        if (xfer_pid == 0) {
-           chdir(tempdir);
-           switch(c) {
-               case 0:
-                       sttybbs(0);
-                       printf("Receiving %s - press Ctrl-D to end.\n",flnm);
-                       fp = fopen(flnm,"w");
+               chdir(tempdir);
+               switch (c) {
+               case 0:
+                       stty_ctdl(0);
+                       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);
-                                       putc(b,fp);
-                                       }
-                               } while(b!=4);
+                               b = inkey();
+                               if (b == 13) {
+                                       b = 10;
+                               }
+                               if (b != 4) {
+                                       scr_printf("%c", b);
+                                       putc(b, fp);
+                               }
+                       } while (b != 4);
                        fclose(fp);
                        exit(0);
-               case 1:
-                       sttybbs(3);
-                       execlp("rx","rx",flnm,NULL);
+               case 1:
+                       screen_reset();
+                       stty_ctdl(3);
+                       execlp("rx", "rx", flnm, NULL);
                        exit(1);
-               case 2:
-                       sttybbs(3);
-                       execlp("rb","rb",NULL);
+               case 2:
+                       screen_reset();
+                       stty_ctdl(3);
+                       execlp("rb", "rb", NULL);
                        exit(1);
-               case 3:
-                       sttybbs(3);
-                       execlp("rz","rz",NULL);
+               case 3:
+                       screen_reset();
+                       stty_ctdl(3);
+                       execlp("rz", "rz", NULL);
                        exit(1);
-                       }
                }
-       else do {
-               b=ka_wait(&a);
-               } while ((b!=xfer_pid)&&(b!=(-1)));
-       sttybbs(0);
+       } else
+               do {
+                       b = ka_wait(&a);
+               } while ((b != xfer_pid) && (b != (-1)));
+       stty_ctdl(0);
+       screen_set();
 
        if (a != 0) {
-               printf("\r*** Transfer unsuccessful.\n");
+               scr_printf("\r*** Transfer unsuccessful.\n");
                nukedir(tempdir);
                return;
+       }
+       scr_printf("\r*** Transfer successful.\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;     /* chop newline */
+                       snprintf(buf, sizeof buf,
+                                "Enter a short description of '%s':\n: ",
+                                flnm);
+                       newprompt(buf, desc, 150);
+                       snprintf(buf, sizeof buf, "%s/%s", tempdir, flnm);
+                       r = CtdlIPCFileUpload(ipc, flnm, desc, buf, progress, tbuf);
+                       scr_printf("%s\n", tbuf);
                }
-
-       printf("\r*** Transfer successful.  Sending file(s) to server...\n");
-       sprintf(buf,"cd %s; ls",tempdir);
-       lsfp = popen(buf,"r");
-       if (lsfp!=NULL) {
-               while (fgets(flnm,256,lsfp)!=NULL) {
-                       flnm[strlen(flnm)-1] = 0;
-                       sprintf(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)],
-                                               ".%d",a);
-                                       ++a;
-                                       serv_puts(buf);
-                                       serv_gets(buf);
-                                       } while((buf[0]!='2')&&(a<100));
-                               if (buf[0]=='2') do {
-                                       a=read(fd,tbuf,4096);
-                                       if (a>0) {
-                                               sprintf(buf,"WRIT %d",a);
-                                               serv_puts(buf);
-                                               serv_gets(buf);
-                                               if (buf[0]=='7')
-                                                       serv_write(tbuf,a);
-                                               }
-                                       } while (a>0);
-                               close(fd);
-                               serv_puts("UCLS 1");
-                               serv_gets(buf);
-                               printf("%s\n",&buf[4]);
-                               }
-                       }
                pclose(lsfp);
-               }
-
-       nukedir(tempdir);
        }
+       nukedir(tempdir);
+}
 
 /* 
- * validate a user
+ * validate a user (returns 0 for successful validation, nonzero if quitting)
  */
-void val_user(char *user)
+int val_user(CtdlIPC *ipc, char *user, int do_validate)
 {
        int a;
-       char cmd[256];
-       char buf[256];
+       char cmd[SIZ];
+       char buf[SIZ];
+       char *resp = NULL;
        int ax = 0;
+       char answer[2];
+       int r;                          /* IPC response code */
 
-       sprintf(cmd,"GREG %s",user);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       if (cmd[0]=='1') {
+       scr_printf("\n");
+       r = CtdlIPCGetUserRegistration(ipc, user, &resp, cmd);
+       if (r / 100 == 1) {
                a = 0;
                do {
-                       serv_gets(buf);
+                       extract_token(buf, resp, 0, '\n', sizeof buf);
+                       remove_token(resp, 0, '\n');
                        ++a;
-                       if (a==1) printf("User #%s - %s  ",
-                               buf,&cmd[4]);
-                       if (a==2) printf("PW: %s\n",buf);
-                       if (a==3) printf("%s\n",buf);
-                       if (a==4) printf("%s\n",buf);
-                       if (a==5) printf("%s, ",buf);
-                       if (a==6) printf("%s ",buf);
-                       if (a==7) printf("%s\n",buf);
-                       if (a==8) printf("%s\n",buf);
-                       if (a==9) ax=atoi(buf);
-                       if (a==10) printf("%s\n",buf);
-                       } while(strcmp(buf,"000"));
-               printf("Current access level: %d (%s)\n",ax,axdefs[ax]);
-               }
-       else {
-               printf("%-30s\n%s\n",user,&cmd[4]);
+                       if (a == 1)
+                               scr_printf("User #%s - %s  ", buf, cmd);
+                       if (a == 2)
+                               scr_printf("PW: %s\n", buf);
+                       if (a == 3)
+                               scr_printf("%s\n", buf);
+                       if (a == 4)
+                               scr_printf("%s\n", buf);
+                       if (a == 5)
+                               scr_printf("%s, ", buf);
+                       if (a == 6)
+                               scr_printf("%s ", buf);
+                       if (a == 7)
+                               scr_printf("%s\n", buf);
+                       if (a == 8)
+                               scr_printf("%s\n", buf);
+                       if (a == 9)
+                               ax = atoi(buf);
+                       if (a == 10)
+                               scr_printf("%s\n", buf);
+                       if (a == 11)
+                               scr_printf("%s\n", buf);
+               } while (strlen(resp));
+               scr_printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
+       } else {
+               scr_printf("%s\n%s\n", user, &cmd[4]);
+       }
+       if (resp) free(resp);
+
+       if (do_validate) {
+               /* now set the access level */
+               while(1) {
+                       sprintf(answer, "%d", ax);
+                       strprompt("New access level (? for help, q to quit)",
+                               answer, 1);
+                       if ((answer[0] >= '0') && (answer[0] <= '6')) {
+                               ax = atoi(answer);
+                               r = CtdlIPCValidateUser(ipc, user, ax, cmd);
+                               if (r / 100 != 2)
+                               scr_printf("%s\n\n", cmd);
+                               return(0);
+                       }
+                       if (tolower(answer[0]) == 'q') {
+                               scr_printf("*** Aborted.\n\n");
+                               return(1);
+                       }
+                       if (answer[0] == '?') {
+                               scr_printf("Available access levels:\n");
+                               for (a=0; a<7; ++a) {
+                                       scr_printf("%d - %s\n",
+                                               a, axdefs[a]);
+                               }
+                       }
                }
-
-       /* now set the access level */
-       ax = intprompt("Access level", ax, 0, 6);
-       sprintf(cmd,"VALI %s|%d",user,ax);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       if (cmd[0]!='2') printf("%s\n",&cmd[4]);
-       printf("\n");
        }
+       return(0);
+}
 
 
-void validate(void) {  /* validate new users */
-       char cmd[256];
-       char buf[256];
+void validate(CtdlIPC *ipc)
+{                              /* validate new users */
+       char cmd[SIZ];
+       char buf[SIZ];
        int finished = 0;
+       int r;                          /* IPC response code */
 
        do {
-               serv_puts("GNUR");
-               serv_gets(cmd);
-               if (cmd[0]!='3') finished = 1;
-               if (cmd[0]=='2') printf("%s\n",&cmd[4]);
-               if (cmd[0]=='3') {
-                       extract(buf,cmd,0);
-                       val_user(&buf[4]);
-                       }
-               } while(finished==0);
-       }
-
-void subshell(void) {
-       int a,b;
-       a=fork();
-       if (a==0) {
-               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));
-               exit(errno);
+               r = CtdlIPCNextUnvalidatedUser(ipc, cmd);
+               if (r / 100 != 3)
+                       finished = 1;
+               if (r / 100 == 2)
+                       scr_printf("%s\n", cmd);
+               if (r / 100 == 3) {
+                       extract_token(buf, cmd, 0, '|', sizeof buf);
+                       if (val_user(ipc, buf, 1) != 0) finished = 1;
                }
-       do {
-               b=ka_wait(NULL);
-               } while ((a!=b)&&(a!=(-1)));
-       sttybbs(0);
+       } while (finished == 0);
+}
+
+void subshell(void)
+{
+       int a, b;
+
+       screen_reset();
+       stty_ctdl(SB_RESTORE);
+       a = fork();
+       if (a == 0) {
+               signal(SIGINT, SIG_DFL);
+               signal(SIGQUIT, SIG_DFL);
+               execlp(getenv("SHELL"), getenv("SHELL"), NULL);
+               err_printf("Could not open a shell: %s\n", strerror(errno));
+               exit(errno);
        }
+       do {
+               b = ka_wait(NULL);
+       } while ((a != b) && (a != (-1)));
+       stty_ctdl(0);
+       screen_set();
+}
 
 /*
  * <.A>ide <F>ile <D>elete command
  */
-void deletefile(void) {
+void deletefile(CtdlIPC *ipc)
+{
        char filename[32];
-       char cmd[256];
+       char buf[SIZ];
 
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       sprintf(cmd,"DELF %s",filename);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       CtdlIPCDeleteFile(ipc, filename, buf);
+       err_printf("%s\n", buf);
+}
 
 /*
  * <.A>ide <F>ile <S>end command
  */
-void netsendfile(void) {
-       char filename[32],destsys[20],cmd[256];
-
-       newprompt("Filename: ",filename,31);
-       if (strlen(filename)==0) return;
-       newprompt("System to send to: ",destsys,19);
-       sprintf(cmd,"NETF %s|%s",filename,destsys);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
+void netsendfile(CtdlIPC *ipc)
+{
+       char filename[32], destsys[20], buf[SIZ];
+
+       newprompt("Filename: ", filename, 31);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("System to send to: ", destsys, 19);
+       CtdlIPCNetSendFile(ipc, filename, destsys, buf);
+       err_printf("%s\n", buf);
        return;
-       }
+}
 
 /*
  * <.A>ide <F>ile <M>ove command
  */
-void movefile(void) {
+void movefile(CtdlIPC *ipc)
+{
        char filename[64];
        char newroom[ROOMNAMELEN];
-       char cmd[256];
-
-       newprompt("Filename: ",filename,63);
-       if (strlen(filename)==0) return;
-       newprompt("Enter target room: ",newroom,ROOMNAMELEN-1);
+       char buf[SIZ];
 
-       sprintf(cmd,"MOVF %s|%s",filename,newroom);
-       serv_puts(cmd);
-       serv_gets(cmd);
-       printf("%s\n",&cmd[4]);
-       }
+       newprompt("Filename: ", filename, 63);
+       if (strlen(filename) == 0)
+               return;
+       newprompt("Enter target room: ", newroom, ROOMNAMELEN - 1);
+       CtdlIPCMoveFile(ipc, filename, newroom, buf);
+       err_printf("%s\n", buf);
+}
 
 
 /* 
  * list of users who have filled out a bio
  */
-void list_bio(void) {
-       char buf[256];
+void list_bio(CtdlIPC *ipc)
+{
+       char buf[SIZ];
+       char *resp = NULL;
        int pos = 1;
+       int r;                  /* IPC response code */
 
-       serv_puts("LBIO");
-       serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+       r = CtdlIPCListUsersWithBios(ipc, &resp, buf);
+       if (r / 100 != 1) {
+               pprintf("%s\n", buf);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               if ((pos+strlen(buf)+5)>screenwidth) {
-                       printf("\n");
+       }
+       while (strlen(resp)) {
+               extract_token(buf, resp, 0, '\n', sizeof buf);
+               remove_token(resp, 0, '\n');
+               if ((pos + strlen(buf) + 5) > screenwidth) {
+                       pprintf("\n");
                        pos = 1;
-                       }
-               printf("%s, ",buf);
-               pos = pos + strlen(buf) + 2;
                }
-       printf("%c%c  \n\n",8,8);
+               pprintf("%s, ", buf);
+               pos = pos + strlen(buf) + 2;
        }
+       pprintf("%c%c  \n\n", 8, 8);
+       if (resp) free(resp);
+}
 
 
 /*
  * read bio
  */
-void read_bio(void) {
-       char who[256];
-       char buf[256];
+void read_bio(CtdlIPC *ipc)
+{
+       char who[SIZ];
+       char buf[SIZ];
+       char *resp = NULL;
+       int r;                  /* IPC response code */
 
        do {
-               newprompt("Read bio for who ('?' for list) : ",who,25);
-               printf("\n");
-               if (!strcmp(who,"?")) list_bio();
-               } while(!strcmp(who,"?"));
-       sprintf(buf,"RBIO %s",who);
-       serv_puts(buf);
-       serv_gets(buf);
-       if (buf[0]!='1') {
-               printf("%s\n",&buf[4]);
+               newprompt("Read bio for who ('?' for list) : ", who, 25);
+               pprintf("\n");
+               if (!strcmp(who, "?"))
+                       list_bio(ipc);
+       } while (!strcmp(who, "?"));
+
+       r = CtdlIPCGetBio(ipc, who, &resp, buf);
+       if (r / 100 != 1) {
+               pprintf("%s\n", buf);
                return;
-               }
-       while (serv_gets(buf), strcmp(buf,"000")) {
-               printf("%s\n",buf);
-               }
        }
+       while (strlen(resp)) {
+               extract_token(buf, resp, 0, '\n', sizeof buf);
+               remove_token(resp, 0, '\n');
+               pprintf("%s\n", buf);
+       }
+       if (resp) free(resp);
+}
 
 
 /* 
  * General system configuration command
  */
-void do_system_configuration(void) {
-       char buf[256];
-       char sc[18][256];
-       int expire_mode = 0;
-       int expire_value = 0;
+void do_system_configuration(CtdlIPC *ipc)
+{
+
+#define NUM_CONFIGS 49
+
+       char buf[SIZ];
+       char sc[NUM_CONFIGS][256];
+       char *resp = NULL;
+       struct ExpirePolicy *site_expirepolicy = NULL;
+       struct ExpirePolicy *mbx_expirepolicy = NULL;
        int a;
+       int logpages = 0;
+       int r;                  /* IPC response code */
+       int server_configs = 0;
 
        /* Clear out the config buffers */
-       bzero(&sc[0][0], sizeof(sc));
+       memset(&sc[0][0], 0, sizeof(sc));
 
        /* Fetch the current config */
-       serv_puts("CONF get");
-       serv_gets(buf);
-       if (buf[0] == '1') {
-               a = 0;
-               while (serv_gets(buf), strcmp(buf, "000")) {
-                       if (a<18) strcpy(&sc[a][0], buf);
-                       ++a;
+       r = CtdlIPCGetSystemConfig(ipc, &resp, buf);
+       if (r / 100 == 1) {
+               server_configs = num_tokens(resp, '\n');
+               for (a=0; a<server_configs; ++a) {
+                       if (a < NUM_CONFIGS) {
+                               extract_token(&sc[a][0], resp, a, '\n', sizeof sc[a]);
                        }
                }
-
+       }
+       if (resp) free(resp);
+       resp = NULL;
        /* Fetch the expire policy (this will silently fail on old servers,
         * resulting in "default" policy)
         */
-       serv_puts("GPEX site");
-       serv_gets(buf);
-       if (buf[0]=='2') {
-               expire_mode = extract_int(&buf[4], 0);
-               expire_value = extract_int(&buf[4], 1);
-               }
+       r = CtdlIPCGetMessageExpirationPolicy(ipc, 2, &site_expirepolicy, buf);
+       r = CtdlIPCGetMessageExpirationPolicy(ipc, 3, &mbx_expirepolicy, buf);
+
+       /* 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("Modem dialup number", &sc[3][0], 15);
-
-       sprintf(&sc[4][0], "%d", (boolprompt(
-               "Automatically give room aide privs to a user who creates a private room",
-               atoi(&sc[4][0]))));
+       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);
 
-       strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
-       strprompt("Initial access level for new users", &sc[6][0], 1);
+       /* 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);
+       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(
-               "Automatically move promblem user messages to twit room",
+       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);
-       strprompt("Paginator prompt", &sc[10][0], 79);
-
-       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]))));
+       snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
+               "Allow Aides to Zap (forget) rooms",
+               atoi(&sc[26][0]))));
+
+       if (strlen(&sc[18][0]) > 0) logpages = 1;
+       else logpages = 0;
+       logpages = boolprompt("Log all pages", logpages);
+       if (logpages) {
+               strprompt("Name of logging room", &sc[18][0], ROOMNAMELEN);
+       }
+       else {
+               sc[18][0] = 0;
+       }
 
-       strprompt("Geographic location of this system", &sc[12][0], 31);
-       strprompt("Name of system administrator", &sc[13][0], 25);
+
+       /* Server tuning */
+
+       strprompt("Server connection idle timeout (in seconds)", &sc[5][0], 4);
        strprompt("Maximum concurrent sessions", &sc[14][0], 4);
-       strprompt("Server-to-server networking password", &sc[15][0], 19);
+       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("POP3S server port (-1 to disable)", &sc[40][0], 5);
+       strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
+       strprompt("IMAPS server port (-1 to disable)", &sc[39][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);
+
+       /* 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);
+       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) {
+               a = strlen(&sc[32][0]);
+               a = (a ? 1 : 0);        /* Set only to 1 or 0 */
+               a = boolprompt("Connect this Citadel to an LDAP directory", a);
+               if (a) {
+                       strprompt("Host name of LDAP server",
+                               &sc[32][0], 127);
+                       strprompt("Port number of LDAP service",
+                               &sc[33][0], 5);
+                       strprompt("Base DN", &sc[34][0], 255);
+                       strprompt("Bind DN", &sc[35][0], 255);
+                       strprompt("Password for bind DN", &sc[36][0], 255);
+               }
+               else {
+                       strcpy(&sc[32][0], "");
+               }
+       }
+
+       /* 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", site_expirepolicy->expire_mode);
                strprompt("System default message expire policy (? for list)",
-                       buf, 1);
+                         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");
-                       }
-               } while((buf[0]<49)||(buf[0]>51));
-       expire_mode = buf[0] - 48;
+                       scr_printf("\n"
+                               "1. Never automatically expire messages\n"
+                               "2. Expire by message count\n"
+                               "3. Expire by message age\n");
+               }
+       } while ((buf[0] < '1') || (buf[0] > '3'));
+       site_expirepolicy->expire_mode = buf[0] - '0';
 
        /* ...lunatics and monsters underneath my bed */
-       if (expire_mode == 2) {
-               sprintf(buf, "%d", expire_value);
+       if (site_expirepolicy->expire_mode == 2) {
+               snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
                strprompt("Keep how many messages online?", buf, 10);
-               expire_value = atol(buf);
+               site_expirepolicy->expire_value = atol(buf);
+       }
+       if (site_expirepolicy->expire_mode == 3) {
+               snprintf(buf, sizeof buf, "%d", site_expirepolicy->expire_value);
+               strprompt("Keep messages for how many days?", buf, 10);
+               site_expirepolicy->expire_value = atol(buf);
+       }
+
+       /* 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);
+               if (buf[0] == '?') {
+                       scr_printf("\n"
+                               "0. Go with the system default\n"
+                               "1. Never automatically expire messages\n"
+                               "2. Expire by message count\n"
+                               "3. Expire by message age\n");
                }
+       } while ((buf[0] < '0') || (buf[0] > '3'));
+       mbx_expirepolicy->expire_mode = buf[0] - '0';
 
-       if (expire_mode == 3) {
-               sprintf(buf, "%d", expire_value);
+       /* ...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);
+               mbx_expirepolicy->expire_value = atol(buf);
+       }
+       if (mbx_expirepolicy->expire_mode == 3) {
+               snprintf(buf, sizeof buf, "%d", mbx_expirepolicy->expire_value);
                strprompt("Keep messages for how many days?", buf, 10);
-               expire_value = atol(buf);
-               }
+               mbx_expirepolicy->expire_value = atol(buf);
+       }
+
+       strprompt("How often to run network jobs (in seconds)", &sc[28][0], 5);
+       strprompt("Hour to run purges (0-23)", &sc[31][0], 2);
+       snprintf(sc[42], sizeof sc[42], "%d", (boolprompt(
+               "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);
+       }
 
        /* 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<18; ++a) serv_puts(&sc[a][0]);
-                       serv_puts("000");
+               r = 1;
+               for (a = 0; a < NUM_CONFIGS; a++)
+                       r += 1 + strlen(sc[a]);
+               resp = (char *)calloc(1, r);
+               if (!resp) {
+                       err_printf("Can't save config - out of memory!\n");
+                       logoff(ipc, 1);
+               }
+               for (a = 0; a < NUM_CONFIGS; a++) {
+                       strcat(resp, sc[a]);
+                       strcat(resp, "\n");
+               }
+               r = CtdlIPCSetSystemConfig(ipc, resp, buf);
+               if (r / 100 != 4) {
+                       err_printf("%s\n", buf);
+               }
+               free(resp);
+
+               r = CtdlIPCSetMessageExpirationPolicy(ipc, 2, site_expirepolicy, buf);
+               if (r / 100 != 2) {
+                       err_printf("%s\n", buf);
+               }
+
+               r = CtdlIPCSetMessageExpirationPolicy(ipc, 3, mbx_expirepolicy, buf);
+               if (r / 100 != 2) {
+                       err_printf("%s\n", 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");
+       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");
+       keyopt(" <5> SpamAssassin   (Address of SpamAssassin server)\n");
+       keyopt(" <6> RBL            (domain suffix of spam hunting RBL)\n");
+       sel = intprompt("Which one", 1, 1, 6);
+       switch(sel) {
+               case 1: strcpy(buf, "localhost");
+                       return;
+               case 2: strcpy(buf, "gatewaydomain");
+                       return;
+               case 3: strcpy(buf, "smarthost");
+                       return;
+               case 4: strcpy(buf, "directory");
+                       return;
+               case 5: strcpy(buf, "spamassassin");
+                       return;
+               case 6: strcpy(buf, "rbl");
+                       return;
+       }
+}
+
+
+/*
+ * Internet mail configuration
+ */
+void do_internet_configuration(CtdlIPC *ipc)
+{
+       char buf[SIZ];
+       char *resp = NULL;
+       int num_recs = 0;
+       char **recs = NULL;
+       char ch;
+       int badkey;
+       int i, j;
+       int quitting = 0;
+       int modified = 0;
+       int r;
+       
+       r = CtdlIPCGetSystemConfigByType(ipc, INTERNETCFG, &resp, buf);
+       if (r / 100 == 1) {
+               while (strlen(resp)) {
+                       extract_token(buf, resp, 0, '\n', sizeof buf);
+                       remove_token(resp, 0, '\n');
+                       ++num_recs;
+                       if (num_recs == 1) recs = malloc(sizeof(char *));
+                       else recs = realloc(recs, (sizeof(char *)) * num_recs);
+                       recs[num_recs-1] = malloc(strlen(buf) + 1);
+                       strcpy(recs[num_recs-1], buf);
+               }
+       }
+       if (resp) free(resp);
+
+       do {
+               scr_printf("\n");
+               color(BRIGHT_WHITE);
+               scr_printf("###                    Host or domain                     Record type      \n");
+               color(DIM_WHITE);
+               scr_printf("--- -------------------------------------------------- --------------------\n");
+               for (i=0; i<num_recs; ++i) {
+               color(DIM_WHITE);
+               scr_printf("%3d ", i+1);
+               extract_token(buf, recs[i], 0, '|', sizeof buf);
+               color(BRIGHT_CYAN);
+               scr_printf("%-50s ", buf);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
+               color(BRIGHT_MAGENTA);
+               scr_printf("%-20s\n", buf);
+               color(DIM_WHITE);
+               }
+
+               ch = keymenu("", "<A>dd|<D>elete|<S>ave|<Q>uit");
+               switch(ch) {
+                       case 'a':
+                               newprompt("Enter host name: ",
+                                       buf, 50);
+                               striplt(buf);
+                               if (strlen(buf) > 0) {
+                                       ++num_recs;
+                                       if (num_recs == 1)
+                                               recs = malloc(sizeof(char *));
+                                       else recs = realloc(recs,
+                                               (sizeof(char *)) * num_recs);
+                                       strcat(buf, "|");
+                                       get_inet_rec_type(ipc,
+                                                       &buf[strlen(buf)]);
+                                       recs[num_recs-1] = strdup(buf);
+                               }
+                               modified = 1;
+                               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];
+                               modified = 1;
+                               break;
+                       case 's':
+                               r = 1;
+                               for (i = 0; i < num_recs; i++)
+                                       r += 1 + strlen(recs[i]);
+                               resp = (char *)calloc(1, r);
+                               if (!resp) {
+                                       err_printf("Can't save config - out of memory!\n");
+                                       logoff(ipc, 1);
+                               }
+                               if (num_recs) for (i = 0; i < num_recs; i++) {
+                                       strcat(resp, recs[i]);
+                                       strcat(resp, "\n");
+                               }
+                               r = CtdlIPCSetSystemConfigByType(ipc, INTERNETCFG, resp, buf);
+                               if (r / 100 != 4) {
+                                       err_printf("%s\n", buf);
+                               } else {
+                                       scr_printf("Wrote %d records.\n", num_recs);
+                                       modified = 0;
+                               }
+                               break;
+                       case 'q':
+                               quitting = !modified || boolprompt(
+                                       "Quit without saving", 0);
+                               break;
+                       default:
+                               badkey = 1;
+               }
+       } while (!quitting);
+
+       if (recs != NULL) {
+               for (i=0; i<num_recs; ++i) free(recs[i]);
+               free(recs);
+       }
+}
+
+
+
+/*
+ * 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;
+       pid_t editor_pid;
+       int cksum;
+       int b, i, tokens;
+       char buf[SIZ];
+       char instr[SIZ];
+       char addr[SIZ];
+       FILE *tempfp;
+       FILE *changefp;
+       char *listing = NULL;
+       int r;
+
+       if (strlen(editor_paths[0]) == 0) {
+               scr_printf("You must have an external editor configured in"
+                       " order to use this function.\n");
+               return;
+       }
+
+       CtdlMakeTempFileName(filename, sizeof filename);
+       CtdlMakeTempFileName(changefile, sizeof changefile);
+
+       tempfp = fopen(filename, "w");
+       if (tempfp == NULL) {
+               err_printf("Cannot open %s: %s\n", filename, strerror(errno));
+               return;
+       }
+
+       fprintf(tempfp, "# Configuration for room: %s\n", room_name);
+       fprintf(tempfp, "# %s\n", comment);
+       fprintf(tempfp, "# Specify one per line.\n"
+                       "\n\n");
+
+       r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+       if (r / 100 == 1) {
+               while(listing && strlen(listing)) {
+                       extract_token(buf, listing, 0, '\n', sizeof buf);
+                       remove_token(listing, 0, '\n');
+                       extract_token(instr, buf, 0, '|', sizeof instr);
+                       if (!strcasecmp(instr, entrytype)) {
+                               tokens = num_tokens(buf, '|');
+                               for (i=1; i<tokens; ++i) {
+                                       extract_token(addr, buf, i, '|', sizeof addr);
+                                       fprintf(tempfp, "%s", addr);
+                                       if (i < (tokens-1)) {
+                                               fprintf(tempfp, "|");
+                                       }
+                               }
+                               fprintf(tempfp, "\n");
+                       }
+               }
+       }
+       if (listing) {
+               free(listing);
+               listing = NULL;
+       }
+       fclose(tempfp);
+
+       e_ex_code = 1;  /* start with a failed exit code */
+       screen_reset();
+       stty_ctdl(SB_RESTORE);
+       editor_pid = fork();
+       cksum = file_checksum(filename);
+       if (editor_pid == 0) {
+               chmod(filename, 0600);
+               putenv("WINDOW_TITLE=Network configuration");
+               execlp(editor_paths[0], editor_paths[0], filename, NULL);
+               exit(1);
+       }
+       if (editor_pid > 0) {
+               do {
+                       e_ex_code = 0;
+                       b = ka_wait(&e_ex_code);
+               } while ((b != editor_pid) && (b >= 0));
+       editor_pid = (-1);
+       stty_ctdl(0);
+       screen_set();
+       }
+
+       if (file_checksum(filename) == cksum) {
+               err_printf("*** Not saving changes.\n");
+               e_ex_code = 1;
+       }
+
+       if (e_ex_code == 0) {           /* Save changes */
+               changefp = fopen(changefile, "w");
+               r = CtdlIPCGetRoomNetworkConfig(ipc, &listing, buf);
+               if (r / 100 == 1) {
+                       while(listing && strlen(listing)) {
+                               extract_token(buf, listing, 0, '\n', sizeof buf);
+                               remove_token(listing, 0, '\n');
+                               extract_token(instr, buf, 0, '|', sizeof instr);
+                               if (strcasecmp(instr, entrytype)) {
+                                       fprintf(changefp, "%s\n", buf);
+                               }
+                       }
+               }
+               if (listing) {
+                       free(listing);
+                       listing = NULL;
+               }
+               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) {
+                               fprintf(changefp, "%s|%s\n", entrytype, buf);
+                       }
+               }
+               fclose(tempfp);
+               fclose(changefp);
+
+               /* now write it to the server... */
+               changefp = fopen(changefile, "r");
+               if (changefp != NULL) {
+                       listing = load_message_from_file(changefp);
+                       if (listing) {
+                               r = CtdlIPCSetRoomNetworkConfig(ipc, listing, buf);
+                               free(listing);
+                               listing = NULL;
                        }
+                       fclose(changefp);
+               }
+       }
+
+       unlink(filename);               /* Delete the temporary files */
+       unlink(changefile);
+}
+
+
+/*
+ * IGnet node configuration
+ */
+void do_ignet_configuration(CtdlIPC *ipc) {
+       char buf[SIZ];
+       int num_recs = 0;
+       char **recs = NULL;
+       char ch;
+       int badkey;
+       int i, j;
+       int quitting = 0;
+       int modified = 0;
+       char *listing = NULL;
+       int r;
+
+       r = CtdlIPCGetSystemConfigByType(ipc, IGNETCFG, &listing, buf);
+       if (r / 100 == 1) while (*listing && strlen(listing)) {
+               extract_token(buf, listing, 0, '\n', sizeof buf);
+               remove_token(listing, 0, '\n');
+
+               ++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);
+       }
+       if (listing) free(listing);
 
-               snprintf(buf, sizeof buf, "SPEX site|%d|%d",
-                       expire_mode, expire_value);
-               serv_puts(buf);
-               serv_gets(buf);
+       do {
+               scr_printf("\n");
+               color(BRIGHT_WHITE);
+               scr_printf(     "### "
+                       "   Node          "
+                       "  Secret           "
+                       "          Host or IP             "
+                       "Port#\n");
+               color(DIM_WHITE);
+               scr_printf(     "--- "
+                       "---------------- "
+                       "------------------ "
+                       "-------------------------------- "
+                       "-----\n");
+               for (i=0; i<num_recs; ++i) {
+               color(DIM_WHITE);
+               scr_printf("%3d ", i+1);
+               extract_token(buf, recs[i], 0, '|', sizeof buf);
+               color(BRIGHT_CYAN);
+               scr_printf("%-16s ", buf);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
+               color(BRIGHT_MAGENTA);
+               scr_printf("%-18s ", buf);
+               extract_token(buf, recs[i], 2, '|', sizeof buf);
+               color(BRIGHT_CYAN);
+               scr_printf("%-32s ", buf);
+               extract_token(buf, recs[i], 3, '|', sizeof buf);
+               color(BRIGHT_MAGENTA);
+               scr_printf("%-3s\n", buf);
+               color(DIM_WHITE);
+               }
+               scr_printf("\n");
+
+               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 node name    : ", buf, 16);
+                               strcat(buf, "|");
+                               newprompt("Enter shared secret: ",
+                                       &buf[strlen(buf)], 18);
+                               strcat(buf, "|");
+                               newprompt("Enter host or IP   : ",
+                                       &buf[strlen(buf)], 32);
+                               strcat(buf, "|504");
+                               strprompt("Enter port number  : ",
+                                       &buf[strlen(buf)-3], 5);
+                               recs[num_recs-1] = strdup(buf);
+                               modified = 1;
+                               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];
+                               modified = 1;
+                               break;
+                       case 's':
+                               r = 1;
+                               for (i = 0; i < num_recs; ++i)
+                                       r += 1 + strlen(recs[i]);
+                               listing = (char*) calloc(1, r);
+                               if (!listing) {
+                                       err_printf("Can't save config - out of memory!\n");
+                                       logoff(ipc, 1);
+                               }
+                               if (num_recs) for (i = 0; i < num_recs; ++i) {
+                                       strcat(listing, recs[i]);
+                                       strcat(listing, "\n");
+                               }
+                               r = CtdlIPCSetSystemConfigByType(ipc, IGNETCFG, listing, buf);
+                               if (r / 100 != 4) {
+                                       scr_printf("%s\n", buf);
+                               } else {
+                                       scr_printf("Wrote %d records.\n", num_recs);
+                                       modified = 0;
+                               }
+                               break;
+                       case 'q':
+                               quitting = !modified || boolprompt(
+                                       "Quit without saving", 0);
+                               break;
+                       default:
+                               badkey = 1;
                }
+       } while (!quitting);
+
+       if (recs != NULL) {
+               for (i=0; i<num_recs; ++i) free(recs[i]);
+               free(recs);
        }
+}
+
+/*
+ * Filter list configuration
+ */
+void do_filterlist_configuration(CtdlIPC *ipc)
+{
+       char buf[SIZ];
+       int num_recs = 0;
+       char **recs = NULL;
+       char ch;
+       int badkey;
+       int i, j;
+       int quitting = 0;
+       int modified = 0;
+       char *listing = NULL;
+       int r;
+
+       r = CtdlIPCGetSystemConfigByType(ipc, FILTERLIST, &listing, buf);
+       if (r / 100 == 1) while (*listing && strlen(listing)) {
+               extract_token(buf, listing, 0, '\n', sizeof buf);
+               remove_token(listing, 0, '\n');
+
+               ++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);
+       }
+       if (listing) free(listing);
+
+       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_token(buf, recs[i], 0, '|', sizeof buf);
+               color(BRIGHT_CYAN);
+               scr_printf("%-28s ", buf);
+               extract_token(buf, recs[i], 1, '|', sizeof buf);
+               color(BRIGHT_MAGENTA);
+               scr_printf("%-28s ", buf);
+               extract_token(buf, recs[i], 2, '|', sizeof buf);
+               color(BRIGHT_CYAN);
+               scr_printf("%-16s\n", buf);
+               extract_token(buf, recs[i], 3, '|', sizeof buf);
+               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);
+                               modified = 1;
+                               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];
+                               modified = 1;
+                               break;
+                       case 's':
+                               r = 1;
+                               for (i = 0; i < num_recs; ++i)
+                                       r += 1 + strlen(recs[i]);
+                               listing = (char*) calloc(1, r);
+                               if (!listing) {
+                                       err_printf("Can't save config - out of memory!\n");
+                                       logoff(ipc, 1);
+                               }
+                               if (num_recs) for (i = 0; i < num_recs; ++i) {
+                                       strcat(listing, recs[i]);
+                                       strcat(listing, "\n");
+                               }
+                               r = CtdlIPCSetSystemConfigByType(ipc, FILTERLIST, listing, buf);
+                               if (r / 100 != 4) {
+                                       scr_printf("%s\n", buf);
+                               } else {
+                                       scr_printf("Wrote %d records.\n", num_recs);
+                                       modified = 0;
+                               }
+                               break;
+                       case 'q':
+                               quitting = !modified || boolprompt(
+                                       "Quit without saving", 0);
+                               break;
+                       default:
+                               badkey = 1;
+               }
+       } while (!quitting);
+
+       if (recs != NULL) {
+               for (i=0; i<num_recs; ++i) free(recs[i]);
+               free(recs);
+       }
+}
+
+