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

Merge remote-tracking branch 'origin/pr/47'

Browse Source 
* origin/pr/47:
  Fix GCC8 warning
  tracis-ci: add support for fc29 dom0
This commit is contained in:
Marek Marczykowski-Górecki 2018-12-06 14:05:41 +01:00
commit 07c286fad5
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -5,3 +5,4 @@ install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
script: ~/qubes-builder/scripts/travis-build script: ~/qubes-builder/scripts/travis-build
env: env:
- DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1 - DIST_DOM0=fc25 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1
- DIST_DOM0=fc29 USE_QUBES_REPO_VERSION=4.0 USE_QUBES_REPO_TESTING=1

6
qrexec/qrexec-client.c
View File

@ -253,7 +253,8 @@ static void send_service_connect(int s, char *conn_ident,
exec_params.connect_domain = connect_domain; exec_params.connect_domain = connect_domain;
exec_params.connect_port = connect_port; exec_params.connect_port = connect_port;
strncpy(srv_params.ident, conn_ident, sizeof(srv_params.ident)); strncpy(srv_params.ident, conn_ident, sizeof(srv_params.ident) - 1);
srv_params.ident[sizeof(srv_params.ident) - 1] = '\0';
if (!write_all(s, &hdr, sizeof(hdr)) if (!write_all(s, &hdr, sizeof(hdr))
|| !write_all(s, &exec_params, sizeof(exec_params)) || !write_all(s, &exec_params, sizeof(exec_params))
@ -722,7 +723,8 @@ int main(int argc, char **argv)
if (strcmp(domname, "dom0") == 0) { if (strcmp(domname, "dom0") == 0) {
if (connect_existing) { if (connect_existing) {
msg_type = MSG_SERVICE_CONNECT; msg_type = MSG_SERVICE_CONNECT;
strncpy(svc_params.ident, request_id, sizeof(svc_params.ident)); strncpy(svc_params.ident, request_id, sizeof(svc_params.ident) - 1);
svc_params.ident[sizeof(svc_params.ident) - 1] = '\0';
} else if (just_exec) } else if (just_exec)
msg_type = MSG_JUST_EXEC; msg_type = MSG_JUST_EXEC;
else else