Applied Matt's patch for pager config -- NOT TESTED

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 7dc74798b5b8664c710a293576f1b31020db7f0f..75d15143cc3866560767f2ee5fdbe00a12f4434b 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -272,6 +272,9 @@ void cmd_conf(char *argbuf)
                cprintf("%s\n", config.c_funambol_source);
                cprintf("%s\n", config.c_funambol_auth);
                cprintf("%d\n", config.c_rbl_at_greeting);
+               cprintf("%s\n", config.c_master_user);
+               cprintf("%s\n", config.c_master_pass);
+               cprintf("%s\n", config.c_pager_program);
                cprintf("000\n");
        }
 
@@ -499,6 +502,17 @@ void cmd_conf(char *argbuf)
                        case 57:
                                config.c_rbl_at_greeting = atoi(buf);
                                break;
+                       case 58:
+                               safestrncpy(config.c_master_user, buf, sizeof config.c_master_user);
+                               break;
+                       case 59:
+                               safestrncpy(config.c_master_pass, buf, sizeof config.c_master_pass);
+                               break;
+                       case 60:
+                               safestrncpy(config.c_pager_program,
+                                       buf,
+                                       sizeof config.c_pager_program);
+                               break;
                        }
                        ++a;
                }
@@ -540,8 +554,7 @@ void cmd_conf(char *argbuf)
                extract_token(confname, argbuf, 1, '|', sizeof confname);
                unbuffer_output();
                cprintf("%d %s\n", SEND_LISTING, confname);
-               confptr = CtdlReadMessageBody("000",
-                               config.c_maxmsglen, NULL, 0);
+               confptr = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0);
                CtdlPutSysConfig(confname, confptr);
                free(confptr);
        }