stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / migrate / serv_migrate.c

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index d982dd2d2d277013d9c7aed82842545ec669b9c8..33b566361e7ba387f59bb79bbe8725cc80c4e7e2 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -34,18 +34,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <ctype.h>
@@ -137,6 +126,7 @@ void migr_export_users_backend(char *username, void *data) {
        cprintf("<u_msgnum_pic>%ld</u_msgnum_pic>\n", u.msgnum_pic);
        cprintf("<u_emailaddrs>%s</u_emailaddrs>\n", u.emailaddrs);
        cprintf("<u_msgnum_inboxrules>%ld</u_msgnum_inboxrules>\n", u.msgnum_inboxrules);
+       cprintf("<u_lastproc_inboxrules>%ld</u_lastproc_inboxrules>\n", u.lastproc_inboxrules);
        client_write(HKEY("</user>\n"));
 }
 
@@ -590,6 +580,7 @@ int migr_userrecord(void *data, const char *el)
        else if (!strcasecmp(el, "u_msgnum_pic"))               usbuf.msgnum_pic = atol(ChrPtr(migr_chardata));
        else if (!strcasecmp(el, "u_emailaddrs"))               safestrncpy(usbuf.emailaddrs, ChrPtr(migr_chardata), sizeof usbuf.emailaddrs);
        else if (!strcasecmp(el, "u_msgnum_inboxrules"))        usbuf.msgnum_inboxrules = atol(ChrPtr(migr_chardata));
+       else if (!strcasecmp(el, "u_lastproc_inboxrules"))      usbuf.lastproc_inboxrules = atol(ChrPtr(migr_chardata));
        else return 0;
        return 1;
 }