diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 17:00:14 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 17:00:14 +0000 |
| commit | 455791f265e6e581fa4ebddd5dc4642b2201f8ce (patch) | |
| tree | ebd5cad9534291822f8c47dbbc8162525f8fe92e /rpc/rpc-transport/socket/src | |
| parent | 92eaa72ea4cd0d06c2161842c548008db0eee01c (diff) | |
| parent | 7d89ec77763dc5076379753c736f7fce2bedd9ec (diff) | |
Merge branch 'upstream' into merge
Diffstat (limited to 'rpc/rpc-transport/socket/src')
| -rw-r--r-- | rpc/rpc-transport/socket/src/name.c | 4 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 1647d5b6b..c6eae9739 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -285,7 +285,7 @@ af_unix_client_get_remote_sockaddr (rpc_transport_t *this, goto err; } - if (strlen (connect_path) > UNIX_PATH_MAX) { + if ((strlen (connect_path) + 1) > UNIX_PATH_MAX) { gf_log (this->name, GF_LOG_ERROR, "connect-path value length %"GF_PRI_SIZET" > %d octets", strlen (connect_path), UNIX_PATH_MAX); @@ -329,7 +329,7 @@ af_unix_server_get_local_sockaddr (rpc_transport_t *this, #define UNIX_PATH_MAX 108 #endif - if (strlen (listen_path) > UNIX_PATH_MAX) { + if ((strlen (listen_path) + 1) > UNIX_PATH_MAX) { gf_log (this->name, GF_LOG_ERROR, "option transport.unix.listen-path has value length " "%"GF_PRI_SIZET" > %d", diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index f9df4ac1d..c6b293be4 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -2195,7 +2195,7 @@ unlock: rpc_transport_notify (this, event, this); } out: - return 0; + return ret; } |