From owner-svn-src-stable-12@freebsd.org Mon Aug 10 10:52:55 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD5BE37E4DC; Mon, 10 Aug 2020 10:52:55 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BQCVH4ZRrz48Bv; Mon, 10 Aug 2020 10:52:55 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 665E49129; Mon, 10 Aug 2020 10:52:55 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07AAqttp008986; Mon, 10 Aug 2020 10:52:55 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07AAqsxA008982; Mon, 10 Aug 2020 10:52:54 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202008101052.07AAqsxA008982@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 10 Aug 2020 10:52:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364074 - in stable/12: lib/libc/gen share/man/man4 sys/kern sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12: lib/libc/gen share/man/man4 sys/kern sys/sys X-SVN-Commit-Revision: 364074 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2020 10:52:55 -0000 Author: kib Date: Mon Aug 10 10:52:54 2020 New Revision: 364074 URL: https://svnweb.freebsd.org/changeset/base/364074 Log: MFC r363813: Add SOL_LOCAL symbolic constant for unix socket option level. Modified: stable/12/lib/libc/gen/getpeereid.c stable/12/share/man/man4/unix.4 stable/12/sys/kern/uipc_usrreq.c stable/12/sys/sys/un.h Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libc/gen/getpeereid.c ============================================================================== --- stable/12/lib/libc/gen/getpeereid.c Mon Aug 10 10:46:08 2020 (r364073) +++ stable/12/lib/libc/gen/getpeereid.c Mon Aug 10 10:52:54 2020 (r364074) @@ -47,7 +47,7 @@ getpeereid(int s, uid_t *euid, gid_t *egid) int error; xuclen = sizeof(xuc); - error = _getsockopt(s, 0, LOCAL_PEERCRED, &xuc, &xuclen); + error = _getsockopt(s, SOL_LOCAL, LOCAL_PEERCRED, &xuc, &xuclen); if (error != 0) return (error); if (xuc.cr_version != XUCRED_VERSION) { Modified: stable/12/share/man/man4/unix.4 ============================================================================== --- stable/12/share/man/man4/unix.4 Mon Aug 10 10:46:08 2020 (r364073) +++ stable/12/share/man/man4/unix.4 Mon Aug 10 10:52:54 2020 (r364074) @@ -28,7 +28,7 @@ .\" @(#)unix.4 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd August 19, 2018 +.Dd August 3, 2020 .Dt UNIX 4 .Os .Sh NAME @@ -195,7 +195,9 @@ The sending process could have exited and its process reused for a new process. .Sh SOCKET OPTIONS .Tn UNIX -domain sockets support a number of socket options which can be set with +domain sockets support a number of socket options for the options level +.Dv SOL_LOCAL , +which can be set with .Xr setsockopt 2 and tested with .Xr getsockopt 2 : Modified: stable/12/sys/kern/uipc_usrreq.c ============================================================================== --- stable/12/sys/kern/uipc_usrreq.c Mon Aug 10 10:46:08 2020 (r364073) +++ stable/12/sys/kern/uipc_usrreq.c Mon Aug 10 10:52:54 2020 (r364074) @@ -1467,7 +1467,7 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt struct xucred xu; int error, optval; - if (sopt->sopt_level != 0) + if (sopt->sopt_level != SOL_LOCAL) return (EINVAL); unp = sotounpcb(so); Modified: stable/12/sys/sys/un.h ============================================================================== --- stable/12/sys/sys/un.h Mon Aug 10 10:46:08 2020 (r364073) +++ stable/12/sys/sys/un.h Mon Aug 10 10:52:54 2020 (r364074) @@ -54,6 +54,8 @@ struct sockaddr_un { #if __BSD_VISIBLE +#define SOL_LOCAL 0 /* Options for local socket */ + /* Socket options. */ #define LOCAL_PEERCRED 1 /* retrieve peer credentials */ #define LOCAL_CREDS 2 /* pass credentials to receiver */