Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dispvm: pass VM name to qrexec-daemon

Browse Source 
Now qrexec-daemon requires three arguments: domid, domname,
default_user.
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-19 00:07:25 +02:00
parent fb745c2ff2
commit ed3d602140
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dispvm/qubes-restore.c
View File

@ -139,7 +139,7 @@ void preload_cache(int fd)
} }
} }
void start_rexec(int domid, char *default_user) void start_rexec(int domid, char *domain_name, char *default_user)
{ {
int pid, status; int pid, status;
char dstr[40]; char dstr[40];
@ -150,7 +150,7 @@ void start_rexec(int domid, char *default_user)
exit(1); exit(1);
case 0: case 0:
execl("/usr/lib/qubes/qrexec-daemon", "qrexec-daemon", execl("/usr/lib/qubes/qrexec-daemon", "qrexec-daemon",
dstr, default_user, NULL); dstr, domain_name, default_user, NULL);
perror("execl"); perror("execl");
exit(1); exit(1);
default:; default:;
@ -478,7 +478,7 @@ int main(int argc, char **argv)
setup_xenstore(netvm_id, domid, dispid, name); setup_xenstore(netvm_id, domid, dispid, name);
rm_fast_flag(); rm_fast_flag();
fprintf(stderr, "time=%s, starting qrexec\n", gettime()); fprintf(stderr, "time=%s, starting qrexec\n", gettime());
start_rexec(domid, default_user); start_rexec(domid, name, default_user);
fprintf(stderr, "time=%s, starting qubes-guid\n", gettime()); fprintf(stderr, "time=%s, starting qubes-guid\n", gettime());
start_guid(domid, argc-guid_args_start, argv+guid_args_start); start_guid(domid, argc-guid_args_start, argv+guid_args_start);
fprintf(stderr, "time=%s, started qubes-guid\n", gettime()); fprintf(stderr, "time=%s, started qubes-guid\n", gettime());