aboutsummaryrefslogtreecommitdiffstats
path: root/man7/unix.7
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2020-09-17 09:42:11 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2020-09-19 10:18:46 +0200
commit29494dfeb8dba557e0b458a21b10a61dbd64a1ab (patch)
tree923e4f65e0d5614ddbc35836c664a4b6bc3f4843 /man7/unix.7
parent14c11c826ae10350a3bfcac2f5b1557f5e713f7e (diff)
downloadman-pages-29494dfeb8dba557e0b458a21b10a61dbd64a1ab.tar.gz
ip.7, unix.7: Minor edits to Stephen Smalley's patches
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man7/unix.7')
-rw-r--r--man7/unix.718
1 files changed, 9 insertions, 9 deletions
diff --git a/man7/unix.7 b/man7/unix.7
index 42f0b31ee7..8bdad50a36 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -364,15 +364,15 @@ into which the security context string will be copied.
If the buffer length is less than the length of the security
context string, then
.BR getsockopt (2)
-will return the required length via
-.I optlen
-and return \-1 and sets
+returns \-1, sets
.I errno
to
-.BR ERANGE .
+.BR ERANGE ,
+and returns the required length via
+.IR optlen .
The caller should allocate at least
.BR NAME_MAX
-bytes for the buffer initially although this is not guaranteed
+bytes for the buffer initially, although this is not guaranteed
to be sufficient.
Resizing the buffer to the returned length
and retrying may be necessary.
@@ -382,14 +382,14 @@ in the returned length, but is not guaranteed to do so: a security
context "foo" might be represented as either {'f','o','o'} of length 3
or {'f','o','o','\\0'} of length 4, which are considered to be
interchangeable.
-It is printable, does not contain non-terminating null characters,
-and is in an unspecified encoding (in particular it
+The string is printable, does not contain non-terminating null characters,
+and is in an unspecified encoding (in particular, it
is not guaranteed to be ASCII or UTF-8).
.IP
The use of this option for sockets in the
.B AF_UNIX
-address family is supported since Linux 2.6.2 for connected stream sockets and
-since Linux 4.18,
+address family is supported since Linux 2.6.2 for connected stream sockets,
+and since Linux 4.18
.\" commit 0b811db2cb2aabc910e53d34ebb95a15997c33e7
also for stream and datagram socket pairs created using
.BR socketpair (2).