diff options
author | delphij <delphij@FreeBSD.org> | 2005-05-14 14:03:21 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2005-05-14 14:03:21 +0000 |
commit | ca2590f422b5d553829662aebfb42f6d5c2f982c (patch) | |
tree | d67886096d279bec33d4d15ff112001004b19ee2 | |
parent | 48257920e2f83d6ab92edf93450d8f4a4b6ab24a (diff) | |
download | FreeBSD-src-ca2590f422b5d553829662aebfb42f6d5c2f982c.zip FreeBSD-src-ca2590f422b5d553829662aebfb42f6d5c2f982c.tar.gz |
Revert to old ttyname_r behavior that when _ioctl() returns 0 (SUCCEEDED),
return the buffer immediately. This will permit ssh and/or PAM logins
broken by previous commit.
The (potential) underlying problem is still under investigation.
Point hat to: me
-rw-r--r-- | lib/libc/gen/ttyname.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c index 54bc24b..56e7ce1 100644 --- a/lib/libc/gen/ttyname.c +++ b/lib/libc/gen/ttyname.c @@ -83,7 +83,7 @@ ttyname_r(int fd, char *buf, size_t len) fgn.len = len - strlen(buf); fgn.buf = buf + strlen(buf); if (!_ioctl(fd, FIODGNAME, &fgn)) - return (EINVAL); + return (0); devname_r(sb.st_rdev, S_IFCHR, buf + strlen(buf), sizeof(buf) - strlen(buf)); return (0); |