X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fmigrate%2Fserv_migrate.c;h=96ff75057f20e218285c7f1820416f6d82539961;hb=d372b4e08a1b644c76985a89f55e77ab16fe691d;hp=4ae75836b6e1a5c5db1dbbf0d6dcabfe43f83fe5;hpb=a80f9ae62e7c9a29d7dd768a73b145f8fce763a5;p=citadel.git

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 4ae75836b..96ff75057 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -1,7 +1,7 @@
 /*
  * This module dumps and/or loads the Citadel database in XML format.
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2018 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -330,7 +330,6 @@ void migr_export_message(long msgnum) {
 	cprintf("<msg_meta_refcount>%d</msg_meta_refcount>\n", smi.meta_refcount);
 	cprintf("<msg_meta_rfc822_length>%ld</msg_meta_rfc822_length>\n", smi.meta_rfc822_length);
 	client_write(HKEY("<msg_meta_content_type>")); xml_strout(smi.meta_content_type); client_write(HKEY("</msg_meta_content_type>\n"));
-	client_write(HKEY("<msg_mimetype>")); xml_strout(smi.mimetype); client_write(HKEY("</msg_mimetype>\n"));
 
 	client_write(HKEY("<msg_text>"));
 	CtdlSerializeMessage(&smr, msg);
@@ -366,8 +365,8 @@ void migr_export_openids(void) {
 	long usernum;
 	char url[512];
 
-	cdb_rewind(CDB_OPENID);
-	while (cdboi = cdb_next_item(CDB_OPENID), cdboi != NULL) {
+	cdb_rewind(CDB_EXTAUTH);
+	while (cdboi = cdb_next_item(CDB_EXTAUTH), cdboi != NULL) {
 		if (cdboi->len > sizeof(long)) {
 			client_write(HKEY("<openid>\n"));
 			memcpy(&usernum, cdboi->ptr, sizeof(long));
@@ -682,7 +681,7 @@ void migr_xml_end(void *data, const char *el)
 		syslog(LOG_DEBUG, "Imported config key=%s", ikey);
 
 		if (ikey != NULL) {
-			CtdlSetConfigStr(ikey, ChrPtr(migr_chardata));
+			CtdlSetConfigStr(ikey, (char *)ChrPtr(migr_chardata));
 			free(ikey);
 			ikey = NULL;
 		}
@@ -712,7 +711,7 @@ void migr_xml_end(void *data, const char *el)
 		oid_data = malloc(oid_data_len);
 		memcpy(oid_data, &openid_usernum, sizeof(long));
 		memcpy(&oid_data[sizeof(long)], openid_url, strlen(openid_url) + 1);
-		cdb_store(CDB_OPENID, openid_url, strlen(openid_url), oid_data, oid_data_len);
+		cdb_store(CDB_EXTAUTH, openid_url, strlen(openid_url), oid_data, oid_data_len);
 		free(oid_data);
 		syslog(LOG_INFO, "Imported OpenID: %s (%ld)", openid_url, openid_usernum);
 	}
@@ -795,7 +794,6 @@ void migr_xml_end(void *data, const char *el)
 	else if (!strcasecmp(el, "msg_meta_refcount"))		smi.meta_refcount = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "msg_meta_rfc822_length"))	smi.meta_rfc822_length = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "msg_meta_content_type"))	safestrncpy(smi.meta_content_type, ChrPtr(migr_chardata), sizeof smi.meta_content_type);
-	else if (!strcasecmp(el, "msg_mimetype"))	        safestrncpy(smi.mimetype, ChrPtr(migr_chardata), sizeof smi.mimetype);
 
 	else if (!strcasecmp(el, "msg_text"))
 	{
@@ -820,14 +818,14 @@ void migr_xml_end(void *data, const char *el)
 		}
 
 		syslog(LOG_INFO,
-		       "%s message #%ld, size=%d, refcount=%d, bodylength=%ld, content-type: %s / %s",
+		       "%s message #%ld, size=%d, refcount=%d, bodylength=%ld, content-type: %s",
 		       (rc!= 0)?"failed to import ":"Imported ",
 		       import_msgnum,
 		       StrLength(migr_MsgData),
 		       smi.meta_refcount,
 		       smi.meta_rfc822_length,
-		       smi.meta_content_type,
-		       smi.mimetype);
+		       smi.meta_content_type
+		);
 		memset(&smi, 0, sizeof(smi));
 	}
 
@@ -895,7 +893,6 @@ void migr_do_import(void) {
 }
 
 
-
 /******************************************************************************
  *                         Dispatcher, Common code                            *
  ******************************************************************************/
@@ -907,10 +904,10 @@ void migr_do_listdirs(void) {
 	cprintf("files|%s\n",		ctdl_file_dir);
 	cprintf("messages|%s\n",	ctdl_message_dir);
 	cprintf("keys|%s\n",		ctdl_key_dir);
-	cprintf("images|%s\n",		ctdl_image_dir);
 	cprintf("000\n");
 }
 
+
 /******************************************************************************
  *                    Repair database integrity                               *
  ******************************************************************************/
@@ -983,12 +980,12 @@ int migr_restore_message_metadata(long msgnum, int refcount)
 
 
 	syslog(LOG_INFO,
-	       "Setting message #%ld meta data to: refcount=%d, bodylength=%ld, content-type: %s / %s",
+	       "Setting message #%ld meta data to: refcount=%d, bodylength=%ld, content-type: %s",
 	       smi.meta_msgnum,
 	       smi.meta_refcount,
 	       smi.meta_rfc822_length,
-	       smi.meta_content_type,
-	       smi.mimetype);
+	       smi.meta_content_type
+	);
 
 	PutMetaData(&smi);