QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: remove dialog box in case of connect timeout (#790)

Browse Source 
Instead exit with failure (keeping child process for further connect
retries) and let the core/user decide what to do.
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-05 03:31:47 +01:00
parent c03a37f2bf
commit f77e2d656d
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qrexec/qrexec-daemon.c
View File

@ -121,38 +121,6 @@ int create_qrexec_socket(int domid, const char *domname)
#define MAX_STARTUP_TIME_DEFAULT 60 #define MAX_STARTUP_TIME_DEFAULT 60
/* ask on qrexec connect timeout */
int ask_on_connect_timeout(int xid, int timeout)
{
char text[1024];
int ret;
struct stat buf;
ret=stat("/usr/bin/kdialog", &buf);
#define KDIALOG_CMD "/usr/bin/kdialog --title 'Qrexec daemon' --warningyesno "
#define ZENITY_CMD "/usr/bin/zenity --title 'Qrexec daemon' --question --text "
snprintf(text, sizeof(text),
"%s"
"'Timeout while trying connecting to qrexec agent of VM %s. Do you want to wait next %d seconds?'",
ret==0 ? KDIALOG_CMD : ZENITY_CMD,
remote_domain_name, timeout);
#undef KDIALOG_CMD
#undef ZENITY_CMD
children_count++;
ret = system(text);
ret = WEXITSTATUS(ret);
// fprintf(stderr, "ret=%d\n", ret);
switch (ret) {
case 1: /* NO */
return 0;
case 0: /*YES */
return 1;
default:
// this can be the case at system startup (netvm), when Xorg isn't running yet
// so just don't give possibility to extend the timeout
return 0;
}
}
/* do the preparatory tasks, needed before entering the main event loop */ /* do the preparatory tasks, needed before entering the main event loop */
void init(int xid) void init(int xid)
{ {
@ -190,12 +158,10 @@ void init(int xid)
sleep(1); sleep(1);
fprintf(stderr, "."); fprintf(stderr, ".");
if (i==startup_timeout-1) { if (i==startup_timeout-1) {
if (ask_on_connect_timeout(xid, startup_timeout)) break;
i=-1;
} }
} }
fprintf(stderr, "Cannot connect to qrexec agent for %d seconds, giving up\n", startup_timeout); fprintf(stderr, "Cannot connect to qrexec agent for %d seconds, still trying in the background\n", startup_timeout);
kill(pid, SIGTERM);
exit(1); exit(1);
} }
close(0); close(0);