From 29494dfeb8dba557e0b458a21b10a61dbd64a1ab Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Thu, 17 Sep 2020 09:42:11 +0200 Subject: [PATCH] ip.7, unix.7: Minor edits to Stephen Smalley's patches Signed-off-by: Michael Kerrisk --- man7/ip.7 | 17 +++++++++-------- man7/unix.7 | 18 +++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/man7/ip.7 b/man7/ip.7 index 89c516fb4..c1ce6aa5f 100644 --- a/man7/ip.7 +++ b/man7/ip.7 @@ -996,15 +996,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. @@ -1014,15 +1014,15 @@ 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_INET address family is supported since Linux 2.6.17 .\" commit 2c7946a7bf45ae86736ab3b43d0085e43947945c -for TCP sockets and since Linux 4.17 +for TCP sockets, and since Linux 4.17 .\" commit d452930fd3b9031e59abfeddb2fa383f1403d61a for SCTP sockets. .IP @@ -1035,6 +1035,7 @@ be configured to pass full security contexts over loopback. Labeled IPSEC always passes full security contexts as part of establishing the security association (SA) and looks them up based on the association for each packet. +.\" .SS /proc interfaces The IP protocol supports a set of diff --git a/man7/unix.7 b/man7/unix.7 index 42f0b31ee..8bdad50a3 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).