diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-01-25 16:37:29 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-01-25 16:37:29 +0100 |
| commit | 26e483d495cb06b9af5d04b44ae7176885433072 (patch) | |
| tree | d94b76f7a2658051d16df5023b1c289922ccea8d /nxcomp/src/ChannelEndPoint.cpp | |
| parent | ca8236e7fe565e851362a744bfa0312274e1f856 (diff) | |
| parent | 889de46f759913742478d2cfe20f1f4a6c2effdc (diff) | |
| download | nx-libs-26e483d495cb06b9af5d04b44ae7176885433072.tar.gz nx-libs-26e483d495cb06b9af5d04b44ae7176885433072.tar.bz2 nx-libs-26e483d495cb06b9af5d04b44ae7176885433072.zip | |
Merge branch 'theqvd-unix_socket_forwarding' into 3.6.x
Attributes GH PR #764: https://github.com/ArcticaProject/nx-libs/pull/764
Diffstat (limited to 'nxcomp/src/ChannelEndPoint.cpp')
| -rw-r--r-- | nxcomp/src/ChannelEndPoint.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp index 7768df137..635dd1ac7 100644 --- a/nxcomp/src/ChannelEndPoint.cpp +++ b/nxcomp/src/ChannelEndPoint.cpp @@ -209,8 +209,6 @@ ChannelEndPoint::getUnixPath(char **unixPath) const { if (unixPath) *unixPath = NULL; - else - return false; long p; char *path = NULL; @@ -230,7 +228,9 @@ ChannelEndPoint::getUnixPath(char **unixPath) const { return false; } - *unixPath = strdup(path); + // Only return value wanted + if ( unixPath ) + *unixPath = strdup(path); return true; } |