* serv_vandelay.c: updated the export format to include some of the config

  items we missed.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 3c075a6498beaf2fdf2d20d15a0eff90808577d6..7d417c34f093506b65a101b5c1b713e28fb2cd46 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -6764,4 +6764,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 24b5987ee36dcab0fbb3678cce904fe025d412e4..b0e72d6f9b6a09a09e2dc32f86c0a2a27285a1bb 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -47,7 +47,7 @@ extern "C" {
  */
 #define REV_LEVEL      651             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
-#define EXPORT_REV_MIN 626             /* Oldest compatible export files */
+#define EXPORT_REV_MIN 651             /* Oldest compatible export files */
 
 #define SERVER_TYPE 0  /* zero for stock Citadel; other developers please
                           obtain SERVER_TYPE codes for your implementations */

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 4cc7c0ffb73da43b5a7cb1bc1fe920b7384088a8..d5f9340ba883a25ea05e06e42dc72af1e42417ae 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -302,6 +302,13 @@ void artv_do_export(void) {
        cprintf("%d\n", config.c_imaps_port);
        cprintf("%d\n", config.c_pop3s_port);
        cprintf("%d\n", config.c_smtps_port);
+       cprintf("%d\n", config.c_rfc822_strict_from);
+       cprintf("%d\n", config.c_aide_zap);
+       cprintf("%d\n", config.c_imap_port);
+       cprintf("%ld\n", config.c_net_freq);
+       cprintf("%d\n", config.c_disable_newu);
+       cprintf("%s\n", config.c_baseroom);
+       cprintf("%s\n", config.c_aideroom);
 
        /* Export the control file */
        get_control();
@@ -369,6 +376,14 @@ void artv_import_config(void) {
        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);
+       client_getln(buf, sizeof buf);  config.c_rfc822_strict_from = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_aide_zap = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_imap_port = atoi(buf);
+       client_getln(buf, sizeof buf);  config.c_net_freq = atol(buf);
+       client_getln(buf, sizeof buf);  config.c_disable_newu = atoi(buf);
+       client_getln(config.c_baseroom, sizeof config.c_baseroom);
+       client_getln(config.c_aideroom, sizeof config.c_aideroom);
+       config.c_enable_fulltext = 0;   /* always disable */
        put_config();
        lprintf(CTDL_INFO, "Imported config file\n");
 }
@@ -384,6 +399,7 @@ void artv_import_control(void) {
        client_getln(buf, sizeof buf);  CitControl.MMnextuser = atol(buf);
        client_getln(buf, sizeof buf);  CitControl.MMnextroom = atol(buf);
        client_getln(buf, sizeof buf);  CitControl.version = atoi(buf);
+       CitControl.MMfulltext = (-1L);  /* always flush */
        put_control();
        lprintf(CTDL_INFO, "Imported control file\n");
 }