X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Futils%2Fctdlmigrate.c;fp=citadel%2Futils%2Fctdlmigrate.c;h=baa5f6de70231f27fec183bb886f413ee8642175;hp=5a5d0c47498b6a1b79da6f0c985f5e5c83a3eb28;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hpb=c8c89455faeb5a76d6ee2264f497b8f790e0e392

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 5a5d0c474..baa5f6de7 100644
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -137,10 +137,14 @@ int main(int argc, char *argv[])
 		"(example: ctdl.foo.org)\n"
 		"--> ");
 	getz(remote_host);
+
+get_remote_user:
 	printf("\nEnter the name of a user on %s who has full access to Citadel files\n"
 		"(usually root)\n--> ",
 		remote_host);
 	getz(remote_user);
+	if (IsEmptyStr(remote_user))
+		goto get_remote_user;
 
 	printf("\nEstablishing an SSH connection to the source system...\n\n");
 	unlink(socket_path);
@@ -194,6 +198,8 @@ int main(int argc, char *argv[])
 	}
 
 	printf("ctdlmigrate will now begin a database migration...\n");
+	printf("  if the system doesn't start working, \n");
+	printf("  have a look at the syslog for pending jobs needing to be terminated.\n");
 
 	snprintf(cmd, sizeof cmd, "ssh -S %s %s@%s %s -w3600 MIGR export",
 		socket_path, remote_user, remote_host, remote_sendcommand);