* Applied matt's funambol patch

[citadel.git] / citadel / routines2.c

diff --git a/citadel/routines2.c b/citadel/routines2.c
index 89e8875e5b30a0e267fa3df53c56574e62fe44b2..50f5aff9a215ef25290235a19bc0c00a91a99f7c 100644 (file)
--- a/citadel/routines2.c
+++ b/citadel/routines2.c
@@ -190,7 +190,7 @@ void entregis(CtdlIPC *ipc)
 
 void updatels(CtdlIPC *ipc)
 {                              /* make all messages old in current room */
-       char buf[SIZ];
+       char buf[256];
        int r;                          /* IPC response code */
 
        if (rc_alt_semantics) {
@@ -216,7 +216,7 @@ void updatels(CtdlIPC *ipc)
  */
 void updatelsa(CtdlIPC *ipc)
 {
-       char buf[SIZ];
+       char buf[256];
        int r;                          /* IPC response code */
 
        r = CtdlIPCSetLastRead(ipc, highest_msg_read, buf);
@@ -230,10 +230,10 @@ void updatelsa(CtdlIPC *ipc)
  */
 void cli_upload(CtdlIPC *ipc)
 {
-       char flnm[SIZ];
+       char flnm[PATH_MAX];
        char desc[151];
-       char buf[SIZ];
-       char tbuf[SIZ];
+       char buf[256];
+       char tbuf[256];
        int r;          /* IPC response code */
        int a;
        int fd;
@@ -282,8 +282,8 @@ void cli_upload(CtdlIPC *ipc)
  */
 void cli_image_upload(CtdlIPC *ipc, char *keyname)
 {
-       char flnm[SIZ];
-       char buf[SIZ];
+       char flnm[PATH_MAX];
+       char buf[256];
        int r;
 
        /* Can we upload this image? */
@@ -308,9 +308,9 @@ void cli_image_upload(CtdlIPC *ipc, char *keyname)
  */
 void upload(CtdlIPC *ipc, int c)
 {                              /* c = upload mode */
-       char flnm[SIZ];
+       char flnm[PATH_MAX];
        char desc[151];
-       char buf[SIZ];
+       char buf[256];
        char tbuf[4096];
        int xfer_pid;
        int a, b;
@@ -413,8 +413,8 @@ void upload(CtdlIPC *ipc, int c)
 int val_user(CtdlIPC *ipc, char *user, int do_validate)
 {
        int a;
-       char cmd[SIZ];
-       char buf[SIZ];
+       char cmd[256];
+       char buf[256];
        char *resp = NULL;
        int ax = 0;
        char answer[2];
@@ -489,8 +489,8 @@ int val_user(CtdlIPC *ipc, char *user, int do_validate)
 
 void validate(CtdlIPC *ipc)
 {                              /* validate new users */
-       char cmd[SIZ];
-       char buf[SIZ];
+       char cmd[256];
+       char buf[256];
        int finished = 0;
        int r;                          /* IPC response code */
 
@@ -534,7 +534,7 @@ void subshell(void)
 void deletefile(CtdlIPC *ipc)
 {
        char filename[32];
-       char buf[SIZ];
+       char buf[256];
 
        newprompt("Filename: ", filename, 31);
        if (strlen(filename) == 0)
@@ -548,7 +548,7 @@ void deletefile(CtdlIPC *ipc)
  */
 void netsendfile(CtdlIPC *ipc)
 {
-       char filename[32], destsys[20], buf[SIZ];
+       char filename[32], destsys[20], buf[256];
 
        newprompt("Filename: ", filename, 31);
        if (strlen(filename) == 0)
@@ -566,7 +566,7 @@ void movefile(CtdlIPC *ipc)
 {
        char filename[64];
        char newroom[ROOMNAMELEN];
-       char buf[SIZ];
+       char buf[256];
 
        newprompt("Filename: ", filename, 63);
        if (strlen(filename) == 0)
@@ -582,7 +582,7 @@ void movefile(CtdlIPC *ipc)
  */
 void list_bio(CtdlIPC *ipc)
 {
-       char buf[SIZ];
+       char buf[256];
        char *resp = NULL;
        int pos = 1;
        int r;                  /* IPC response code */
@@ -612,8 +612,8 @@ void list_bio(CtdlIPC *ipc)
  */
 void read_bio(CtdlIPC *ipc)
 {
-       char who[SIZ];
-       char buf[SIZ];
+       char who[256];
+       char buf[256];
        char *resp = NULL;
        int r;                  /* IPC response code */
 
@@ -644,9 +644,9 @@ void read_bio(CtdlIPC *ipc)
 void do_system_configuration(CtdlIPC *ipc)
 {
 
-#define NUM_CONFIGS 52
+#define NUM_CONFIGS 57
 
-       char buf[SIZ];
+       char buf[256];
        char sc[NUM_CONFIGS][256];
        char *resp = NULL;
        struct ExpirePolicy *site_expirepolicy = NULL;
@@ -722,7 +722,9 @@ void do_system_configuration(CtdlIPC *ipc)
        else {
                sc[18][0] = 0;
        }
-
+       snprintf(sc[52], sizeof sc[52], "%d", (boolprompt(
+               "Use system authentication",
+               atoi(&sc[52][0]))));
 
        /* Server tuning */
 
@@ -745,7 +747,6 @@ void do_system_configuration(CtdlIPC *ipc)
        strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
        strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
        strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
-
        /* This logic flips the question around, because it's one of those
         * situations where 0=yes and 1=no
         */
@@ -855,6 +856,12 @@ void do_system_configuration(CtdlIPC *ipc)
                        &sc[48][0], 127);
        }
 
+       /* Funambol push stuff */
+       strprompt("Funambol server (blank to disable)", &sc[53][0], 63);
+       strprompt("Funambol server port", &sc[54][0], 5);
+       strprompt("Funambol sync source", &sc[55][0], 63);
+       strprompt("Funambol authentication details (user:pass in Base64)", &sc[56][0],63);
+       
        /* Save it */
        scr_printf("Save this configuration? ");
        if (yesno()) {
@@ -925,7 +932,7 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) {
  */
 void do_internet_configuration(CtdlIPC *ipc)
 {
-       char buf[SIZ];
+       char buf[256];
        char *resp = NULL;
        int num_recs = 0;
        char **recs = NULL;
@@ -1045,9 +1052,9 @@ void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment)
        pid_t editor_pid;
        int cksum;
        int b, i, tokens;
-       char buf[SIZ];
-       char instr[SIZ];
-       char addr[SIZ];
+       char buf[1024];
+       char instr[1024];
+       char addr[1024];
        FILE *tempfp;
        FILE *changefp;
        char *listing = NULL;