-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Transparently handle the upgrading of server data formats.
+ *
+ */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.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 <sys/wait.h>
#include <string.h>
#include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#include "citadel.h"
#include "server.h"
-#include <syslog.h>
-#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
#include "control.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "database.h"
+#include "room_ops.h"
#include "user_ops.h"
#include "msgbase.h"
+#include "tools.h"
#include "serv_upgrade.h"
void do_pre555_usersupp_upgrade(void) {
/* ...and overwrite the records with new format records */
rewind(fp);
while (fread(&usbuf, sizeof(struct pre555usersupp), 1, fp) > 0) {
+ if (strlen(usbuf.fullname) > 0) {
lprintf(9, "Upgrading <%s>\n", usbuf.fullname);
memset(&newus, 0, sizeof(struct usersupp));
newus.flags = usbuf.flags;
newus.timescalled = (long) usbuf.timescalled;
newus.posted = (long) usbuf.posted;
- newus.axlevel = (CIT_UBYTE) usbuf.axlevel;
+ newus.axlevel = (cit_uint8_t) usbuf.axlevel;
newus.usernum = (long) usbuf.usernum;
newus.lastcall = (long) usbuf.lastcall;
newus.USuserpurge = (int) usbuf.USuserpurge;
strcpy(newus.fullname, usbuf.fullname);
- newus.USscreenwidth = (CIT_UBYTE) usbuf.USscreenwidth;
- newus.USscreenheight = (CIT_UBYTE) usbuf.USscreenheight;
+ newus.USscreenwidth = (cit_uint8_t) usbuf.USscreenwidth;
+ newus.USscreenheight = (cit_uint8_t) usbuf.USscreenheight;
putuser(&newus);
/* write the vcard */
- sprintf(vcard,
+ snprintf(vcard, sizeof vcard,
"Content-type: text/x-vcard\n\n"
"begin:vcard\n"
"n:%s\n"
fwrite(vcard, strlen(vcard)+1, 1, tp);
fclose(tp);
- CtdlWriteObject(CONFIGROOM, "text/x-vcard",
- tempfilename, &newus, 0, 1);
+ CtdlWriteObject(USERCONFIGROOM, "text/x-vcard",
+ tempfilename, &newus, 0, 1, CM_SKIP_HOOKS);
unlink(tempfilename);
-
+ }
}
fclose(fp); /* this file deletes automatically */
+/*
+ * Back end processing function for cmd_bmbx
+ */
+void cmd_bmbx_backend(struct quickroom *qrbuf, void *data) {
+ static struct RoomProcList *rplist = NULL;
+ struct RoomProcList *ptr;
+ struct quickroom qr;
+
+ /* Lazy programming here. Call this function as a ForEachRoom backend
+ * in order to queue up the room names, or call it with a null room
+ * to make it do the processing.
+ */
+ if (qrbuf != NULL) {
+ ptr = (struct RoomProcList *)
+ mallok(sizeof (struct RoomProcList));
+ if (ptr == NULL) return;
+
+ safestrncpy(ptr->name, qrbuf->QRname, sizeof ptr->name);
+ ptr->next = rplist;
+ rplist = ptr;
+ return;
+ }
+
+ while (rplist != NULL) {
+
+ if (lgetroom(&qr, rplist->name) == 0) {
+ lprintf(9, "Processing <%s>...\n", rplist->name);
+ if ( (qr.QRflags & QR_MAILBOX) == 0) {
+ lprintf(9, " -- not a mailbox\n");
+ }
+ else {
+
+ qr.QRgen = time(NULL);
+ lprintf(9, " -- fixed!\n");
+ }
+ lputroom(&qr);
+ }
+
+ ptr = rplist;
+ rplist = rplist->next;
+ phree(ptr);
+ }
+}
+
+/*
+ * quick fix to bump mailbox generation numbers
+ */
+void bump_mailbox_generation_numbers(void) {
+ lprintf(5, "Applying security fix to mailbox rooms\n");
+ ForEachRoom(cmd_bmbx_backend, NULL);
+ cmd_bmbx_backend(NULL, NULL);
+ return;
+}
+
+
+
+
+
+
void check_server_upgrades(void) {
get_control();
(CitControl.version / 100),
(CitControl.version % 100) );
- if (CitControl.version < config.c_setup_level) {
+ if (CitControl.version < REV_LEVEL) {
lprintf(5, "Server hosted updates need to be processed at "
"this time. Please wait...\n");
}
return;
}
-
if (CitControl.version < 555) do_pre555_usersupp_upgrade();
+ if (CitControl.version < 591) bump_mailbox_generation_numbers();
-
- CitControl.version = config.c_setup_level;
+ CitControl.version = REV_LEVEL;
put_control();
}
-char *Dynamic_Module_Init(void)
+
+
+
+
+
+
+
+char *serv_upgrade_init(void)
{
check_server_upgrades();
return "$Id$";