* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / serv_vandelay.c

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 372b1e2555b823ba228b74a37f53ae8960469a70..4cc7c0ffb73da43b5a7cb1bc1fe920b7384088a8 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -264,7 +264,7 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_fqdn);
        cprintf("%s\n", config.c_humannode);
        cprintf("%s\n", config.c_phonenum);
-       cprintf("%ld\n", (long)config.c_bbsuid);
+       cprintf("%ld\n", (long)config.c_ctdluid);
        cprintf("%d\n", config.c_creataide);
        cprintf("%d\n", config.c_sleeping);
        cprintf("%d\n", config.c_initax);
@@ -273,7 +273,7 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_twitroom);
        cprintf("%s\n", config.c_moreprompt);
        cprintf("%d\n", config.c_restrict);
-       cprintf("%s\n", config.c_bbs_city);
+       cprintf("%s\n", config.c_site_location);
        cprintf("%s\n", config.c_sysadm);
        cprintf("%d\n", config.c_setup_level);
        cprintf("%d\n", config.c_maxsessions);
@@ -299,6 +299,9 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_ldap_bind_pw);
        cprintf("%s\n", config.c_ip_addr);
        cprintf("%d\n", config.c_msa_port);
+       cprintf("%d\n", config.c_imaps_port);
+       cprintf("%d\n", config.c_pop3s_port);
+       cprintf("%d\n", config.c_smtps_port);
 
        /* Export the control file */
        get_control();
@@ -328,7 +331,7 @@ void artv_import_config(void) {
        client_getln(config.c_fqdn, sizeof config.c_fqdn);
        client_getln(config.c_humannode, sizeof config.c_humannode);
        client_getln(config.c_phonenum, sizeof config.c_phonenum);
-       client_getln(buf, sizeof buf);  config.c_bbsuid = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_ctdluid = atoi(buf);
        client_getln(buf, sizeof buf);  config.c_creataide = atoi(buf);
        client_getln(buf, sizeof buf);  config.c_sleeping = atoi(buf);
        client_getln(buf, sizeof buf);  config.c_initax = atoi(buf);
@@ -337,7 +340,7 @@ void artv_import_config(void) {
        client_getln(config.c_twitroom, sizeof config.c_twitroom);
        client_getln(config.c_moreprompt, sizeof config.c_moreprompt);
        client_getln(buf, sizeof buf);  config.c_restrict = atoi(buf);
-       client_getln(config.c_bbs_city, sizeof config.c_bbs_city);
+       client_getln(config.c_site_location, sizeof config.c_site_location);
        client_getln(config.c_sysadm, sizeof config.c_sysadm);
        client_getln(buf, sizeof buf);  config.c_setup_level = atoi(buf);
        client_getln(buf, sizeof buf);  config.c_maxsessions = atoi(buf);
@@ -363,6 +366,9 @@ void artv_import_config(void) {
        client_getln(config.c_ldap_bind_pw, sizeof config.c_ldap_bind_pw);
        client_getln(config.c_ip_addr, sizeof config.c_ip_addr);
        client_getln(buf, sizeof buf);  config.c_msa_port = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_imaps_port = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_pop3s_port = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_smtps_port = atoi(buf);
        put_config();
        lprintf(CTDL_INFO, "Imported config file\n");
 }
@@ -567,7 +573,7 @@ void artv_do_import(void) {
 
 
 void cmd_artv(char *cmdbuf) {
-       char cmd[SIZ];
+       char cmd[32];
        static int is_running = 0;
 
        if (CtdlAccessCheck(ac_internal)) return;
@@ -581,7 +587,7 @@ void cmd_artv(char *cmdbuf) {
        strcpy(artv_tempfilename1, tmpnam(NULL));
        strcpy(artv_tempfilename2, tmpnam(NULL));
 
-       extract(cmd, cmdbuf, 0);
+       extract_token(cmd, cmdbuf, 0, '|', sizeof cmd);
        if (!strcasecmp(cmd, "export")) artv_do_export();
        else if (!strcasecmp(cmd, "import")) artv_do_import();
        else cprintf("%d illegal command\n", ERROR + ILLEGAL_VALUE);