svn commit: r330094 - stable/11/lib/libc/gen

Pedro F. Giffuni pfg at FreeBSD.org
Wed Feb 28 02:38:00 UTC 2018


Author: pfg
Date: Wed Feb 28 02:37:59 2018
New Revision: 330094
URL: https://svnweb.freebsd.org/changeset/base/330094

Log:
  MFC r329846:
  getpeereid(3): Fix behavior on failure to match documentation.
  
  According to the getpeereid(3) documentation, on failure the value -1 is
  returned and the global variable errno is set to indicate the error. We
  were returning the error instead.
  
  Obtained from:	Apple's Libc-1244.30.3

Modified:
  stable/11/lib/libc/gen/getpeereid.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libc/gen/getpeereid.c
==============================================================================
--- stable/11/lib/libc/gen/getpeereid.c	Wed Feb 28 00:30:03 2018	(r330093)
+++ stable/11/lib/libc/gen/getpeereid.c	Wed Feb 28 02:37:59 2018	(r330094)
@@ -48,8 +48,10 @@ getpeereid(int s, uid_t *euid, gid_t *egid)
 	error = _getsockopt(s, 0, LOCAL_PEERCRED, &xuc, &xuclen);
 	if (error != 0)
 		return (error);
-	if (xuc.cr_version != XUCRED_VERSION)
-		return (EINVAL);
+	if (xuc.cr_version != XUCRED_VERSION) {
+		errno = EINVAL;
+		return (-1);
+	}
 	*euid = xuc.cr_uid;
 	*egid = xuc.cr_gid;
 	return (0);


More information about the svn-src-stable mailing list