maga

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 4ae75836b6e1a5c5db1dbbf0d6dcabfe43f83fe5..9fc771ec02f59a1a2d98231b27536f12b970a958 100644 (file)
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -682,7 +682,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;
                }
@@ -895,7 +895,6 @@ void migr_do_import(void) {
 }
 
 
-
 /******************************************************************************
  *                         Dispatcher, Common code                            *
  ******************************************************************************/
@@ -907,10 +906,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                               *
  ******************************************************************************/

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index faf70e6fef325525edd01a78ad32cfe7287a3704..dc74da406ec70ad977b5bb33fbf8f535af5444e9 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -443,7 +443,6 @@ int create_run_directories(long UID, long GID)
        int rv = 0;
        rv += create_dir(ctdl_message_dir   , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_hlp_dir       , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-       rv += create_dir(ctdl_image_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_bb_dir        , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_file_dir      , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
        rv += create_dir(ctdl_spool_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 199772ecc99b21c02e1ff89152209347d0583e63..8fdfa3336c86d68ca84da16d0bcb8175194a891e 100644 (file)
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -259,10 +259,6 @@ FAIL:      if (sourcefp) pclose(sourcefp);
                        snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
                                socket_path, remote_user, remote_host, &buf[5], ctdl_key_dir);
                }
-               else if (!strncasecmp(buf, "images|", 7)) {
-                       snprintf(cmd, sizeof cmd, "rsync -va --rsh='ssh -S %s' %s@%s:%s/ %s/",
-                               socket_path, remote_user, remote_host, &buf[7], ctdl_image_dir);
-               }
                else {
                        strcpy(cmd, "false");   /* cheap and sleazy way to throw an error */
                }