commit be2bfb9dbde59de27684623b9d8261262c5ad076
author Stratos Psomadakis <psomas@grnet.gr> Thu Sep 11 18:19:29 2014 +0300
committer Kevin Wolf <kwolf@redhat.com> Fri Sep 12 10:27:54 2014 +0200
tree cab27d8abeb200051a31122af58717113563d068
parent 48f364dd0ba8d6323ee9ac2b35996eef667bac39

iotests: Send the correct fd in socket_scm_helper

Make sure to pass the correct fd via SCM_RIGHTS in socket_scm_helper.c
(i.e. fd_to_send, not socket-fd).

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

tests/qemu-iotests/socket_scm_helper.c

diff --git a/tests/qemu-iotests/socket_scm_helper.c b/tests/qemu-iotests/socket_scm_helper.c
index 0e2b285..8195983 100644
--- a/tests/qemu-iotests/socket_scm_helper.c
+++ b/tests/qemu-iotests/socket_scm_helper.c
@@ -52,7 +52,7 @@
     cmsg->cmsg_len = CMSG_LEN(sizeof(int));
     cmsg->cmsg_level = SOL_SOCKET;
     cmsg->cmsg_type = SCM_RIGHTS;
-    memcpy(CMSG_DATA(cmsg), &fd, sizeof(int));
+    memcpy(CMSG_DATA(cmsg), &fd_to_send, sizeof(int));
 
     do {
         ret = sendmsg(fd, &msg, 0);