* Added "Base DN" "Bind DN" and "Bind DN password" config options

[citadel.git] / citadel / serv_vandelay.c

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 4b54fe582c16b1fa37b7d93136ac070a8d0574ce..1e1addde87eb326974e4056923fd80e9a7d67ae5 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -177,6 +177,7 @@ void artv_export_visits(void) {
                        cprintf("%ld\n", vbuf.v_lastseen);
                }
 
+               cprintf("%s\n", vbuf.v_answered);
                cprintf("%u\n", vbuf.v_flags);
                cprintf("%d\n", vbuf.v_view);
        }
@@ -269,9 +270,7 @@ void artv_do_export(void) {
        cprintf("%s\n", config.c_sysadm);
        cprintf("%d\n", config.c_setup_level);
        cprintf("%d\n", config.c_maxsessions);
-       cprintf("%s\n", config.c_net_password);
        cprintf("%d\n", config.c_port_number);
-       cprintf("%d\n", config.c_ipgm_secret);
        cprintf("%d\n", config.c_ep.expire_mode);
        cprintf("%d\n", config.c_ep.expire_value);
        cprintf("%d\n", config.c_userpurge);
@@ -283,6 +282,14 @@ void artv_do_export(void) {
        cprintf("%d\n", config.c_max_workers);
        cprintf("%d\n", config.c_pop3_port);
        cprintf("%d\n", config.c_smtp_port);
+       cprintf("%d\n", config.c_purge_hour);
+       cprintf("%d\n", config.c_mbxep.expire_mode);
+       cprintf("%d\n", config.c_mbxep.expire_value);
+       cprintf("%s\n", config.c_ldap_host);
+       cprintf("%d\n", config.c_ldap_port);
+       cprintf("%s\n", config.c_ldap_base_dn);
+       cprintf("%s\n", config.c_ldap_bind_dn);
+       cprintf("%s\n", config.c_ldap_bind_pw);
 
        /* Export the control file */
        get_control();
@@ -327,9 +334,7 @@ void artv_import_config(void) {
        lprintf(9, "c_sysadm = %s\n", config.c_sysadm);
        client_gets(buf);       config.c_setup_level = atoi(buf);
        client_gets(buf);       config.c_maxsessions = atoi(buf);
-       client_gets(config.c_net_password);
        client_gets(buf);       config.c_port_number = atoi(buf);
-       client_gets(buf);       config.c_ipgm_secret = atoi(buf);
        client_gets(buf);       config.c_ep.expire_mode = atoi(buf);
        client_gets(buf);       config.c_ep.expire_value = atoi(buf);
        client_gets(buf);       config.c_userpurge = atoi(buf);
@@ -341,6 +346,14 @@ void artv_import_config(void) {
        client_gets(buf);       config.c_max_workers = atoi(buf);
        client_gets(buf);       config.c_pop3_port = atoi(buf);
        client_gets(buf);       config.c_smtp_port = atoi(buf);
+       client_gets(buf);       config.c_purge_hour = atoi(buf);
+       client_gets(buf);       config.c_mbxep.expire_mode = atoi(buf);
+       client_gets(buf);       config.c_mbxep.expire_value = atoi(buf);
+       client_gets(config.c_ldap_host);
+       client_gets(buf);       config.c_ldap_port = atoi(buf);
+       client_gets(config.c_ldap_base_dn);
+       client_gets(config.c_ldap_bind_dn);
+       client_gets(config.c_ldap_bind_pw);
        put_config();
        lprintf(7, "Imported config file\n");
 }
@@ -450,6 +463,7 @@ void artv_import_visit(void) {
        for (i=0; i<strlen(buf); ++i) if (!isdigit(buf[i])) is_textual_seen = 1;
        if (is_textual_seen)    strcpy(vbuf.v_seen, buf);
 
+       client_gets(vbuf.v_answered);
        client_gets(buf);       vbuf.v_flags = atoi(buf);
        client_gets(buf);       vbuf.v_view = atoi(buf);
        put_visit(&vbuf);
@@ -553,7 +567,6 @@ void cmd_artv(char *cmdbuf) {
        }
        is_running = 1;
 
-       strcpy(artv_tempfilename1, tmpnam(NULL));
        strcpy(artv_tempfilename2, tmpnam(NULL));
 
        extract(cmd, cmdbuf, 0);