qrexec: display VM name in connect timeout message (#723)

Now it is possible, as we have domain name from cmdline.
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-18 03:47:58 +02:00
parent c92bc0a05c
commit 28aa4d992f

View File

@ -98,9 +98,9 @@ int ask_on_connect_timeout(int xid, int timeout)
#define ZENITY_CMD "zenity --title 'Qrexec daemon' --question --text " #define ZENITY_CMD "zenity --title 'Qrexec daemon' --question --text "
snprintf(text, sizeof(text), snprintf(text, sizeof(text),
"%s" "%s"
"'Timeout while trying connecting to qrexec agent (Xen domain ID: %d). Do you want to wait next %d seconds?'", "'Timeout while trying connecting to qrexec agent of VM %s. Do you want to wait next %d seconds?'",
ret==0 ? KDIALOG_CMD : ZENITY_CMD, ret==0 ? KDIALOG_CMD : ZENITY_CMD,
xid, timeout); remote_domain_name, timeout);
#undef KDIALOG_CMD #undef KDIALOG_CMD
#undef ZENITY_CMD #undef ZENITY_CMD
ret = system(text); ret = system(text);