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

qrexec: get domain name from cmdline

Browse Source 
libvchan_get_domain_name will be removed
This commit is contained in:
Marek Marczykowski 2013-05-04 04:17:58 +02:00 committed by Marek Marczykowski-Górecki
parent 3379c343bc
commit cf8959dbfe
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qrexec/qrexec-daemon.c
View File

@ -182,7 +182,7 @@ void init(int xid)
exit(1); exit(1);
} }
remote_domain_name = peer_client_init(xid, REXEC_PORT); peer_client_init(xid, REXEC_PORT);
setuid(getuid()); setuid(getuid());
/* When running as root, make the socket accessible; perms on /var/run/qubes still apply */ /* When running as root, make the socket accessible; perms on /var/run/qubes still apply */
umask(0); umask(0);
@ -637,12 +637,13 @@ int main(int argc, char **argv)
int max; int max;
sigset_t chld_set; sigset_t chld_set;
if (argc != 2 && argc != 3) { if (argc != 3 && argc != 4) {
fprintf(stderr, "usage: %s domainid [default user]\n", argv[0]); fprintf(stderr, "usage: %s domainid domain-name [default user]\n", argv[0]);
exit(1); exit(1);
} }
if (argc == 3) remote_domain_name = argv[2];
default_user = argv[2]; if (argc == 4)
default_user = argv[3];
init(atoi(argv[1])); init(atoi(argv[1]));
sigemptyset(&chld_set); sigemptyset(&chld_set);
sigaddset(&chld_set, SIGCHLD); sigaddset(&chld_set, SIGCHLD);