diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2014-05-13 16:05:44 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-05-22 12:05:37 +0200 |
| commit | efb124918850c340df711ed643a04fef1424c203 (patch) | |
| tree | 2e483c14537cf891ea2d095b25771d0fec67fac1 | |
| parent | 1a3eac1c6c8f739a1da0b40f683b651475808eae (diff) | |
| download | socket_wrapper-efb124918850c340df711ed643a04fef1424c203.tar.gz socket_wrapper-efb124918850c340df711ed643a04fef1424c203.tar.xz socket_wrapper-efb124918850c340df711ed643a04fef1424c203.zip | |
swrap: Call swrap_msghdr_socket_info in swrap_recvmsg_after().
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | src/socket_wrapper.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index fdb0c59..e77ef85 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -3400,6 +3400,7 @@ static int swrap_recvmsg_after(int fd, off_t ofs = 0; size_t avail = 0; size_t remain; + int rc; /* to give better errors */ if (ret == -1) { @@ -3416,8 +3417,8 @@ static int swrap_recvmsg_after(int fd, } if (avail == 0) { - errno = saved_errno; - return 0; + rc = 0; + goto done; } if (ret == -1) { @@ -3460,8 +3461,6 @@ static int swrap_recvmsg_after(int fd, } if (un_addr != NULL) { - int rc; - rc = sockaddr_convert_from_un(si, un_addr, un_addrlen, @@ -3488,10 +3487,23 @@ static int swrap_recvmsg_after(int fd, break; } + rc = 0; done: free(buf); errno = saved_errno; - return 0; + +#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL + if (rc == 0 && + msg->msg_controllen > 0 && + msg->msg_control != NULL) { + rc = swrap_msghdr_add_socket_info(si, msg); + if (rc < 0) { + return -1; + } + } +#endif + + return rc; } /**************************************************************************** |