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

qrexec: translate keywords in target specification on the client side

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-19 02:08:45 +01:00
parent 5512e4eada
commit 878bb98a82
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qrexec/qrexec-client-vm.c
View File

@ -72,6 +72,19 @@ char *get_program_name(char *prog)
return prog; return prog;
} }
/* Target specification with keyword have changed from $... to @... . Convert
* the argument appropriately, to avoid breaking user tools.
*/
void convert_target_name_keyword(char *target)
{
size_t i;
size_t len = strlen(target);
for (i = 0; i < len; i++)
if (target[i] == '$')
target[i] = '@';
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int trigger_fd; int trigger_fd;
@ -97,8 +110,11 @@ int main(int argc, char **argv)
memset(&params, 0, sizeof(params)); memset(&params, 0, sizeof(params));
strncpy(params.service_name, argv[2], sizeof(params.service_name)); strncpy(params.service_name, argv[2], sizeof(params.service_name));
convert_target_name_keyword(argv[1]);
strncpy(params.target_domain, argv[1], strncpy(params.target_domain, argv[1],
sizeof(params.target_domain)); sizeof(params.target_domain));
snprintf(params.request_id.ident, snprintf(params.request_id.ident,
sizeof(params.request_id.ident), "SOCKET"); sizeof(params.request_id.ident), "SOCKET");