diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-18 11:45:29 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-18 11:45:29 +0000 |
| commit | 37a808de7ecdf87a496bd71db16cdf561e7e1537 (patch) | |
| tree | 04999339ab92f320cc02fd7d316b94d9916e94e6 /src/libs6net | |
| parent | 2fcff7d8c86bc6a752bd66259c2f3afa7c301e85 (diff) | |
| download | s6-networking-37a808de7ecdf87a496bd71db16cdf561e7e1537.tar.xz | |
Fix minidentd (wrong byte order in /proc/net/tcp*) and ident-client.
Add mgetuid.c to the list of cleaned targets.
Diffstat (limited to 'src/libs6net')
| -rw-r--r-- | src/libs6net/s6net_ident_reply_get.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libs6net/s6net_ident_reply_get.c b/src/libs6net/s6net_ident_reply_get.c index 3e11121..b12925f 100644 --- a/src/libs6net/s6net_ident_reply_get.c +++ b/src/libs6net/s6net_ident_reply_get.c @@ -19,7 +19,7 @@ int s6net_ident_reply_get (char *s, ip46_t const *remoteip, uint16 remoteport, i fd = socket_tcp46(ip46_is6(remoteip)) ; if (fd < 0) return -1 ; if (socket_bind46(fd, localip, 0) < 0) goto err ; - if (socket_deadlineconnstamp46(fd, remoteip, 113, deadline, stamp) <= 0) goto err ; + if (!socket_deadlineconnstamp46(fd, remoteip, 113, deadline, stamp)) goto err ; { char buf[S6NET_IDENT_REPLY_SIZE + 1] ; char fmt[UINT16_FMT] ; @@ -35,8 +35,7 @@ int s6net_ident_reply_get (char *s, ip46_t const *remoteip, uint16 remoteport, i if (sanitize_read(timed_getlnmax(&b, s, S6NET_IDENT_REPLY_SIZE, &len, '\n', deadline, stamp)) <= 0) goto err ; } fd_close(fd) ; - if (len < 2) return (errno = EPROTO, -1) ; - len -= 2 ; + if (!len--) return (errno = EPROTO, -1) ; s[len] = 0 ; return (int)len ; |