From nobody@FreeBSD.org  Wed Jan  1 04:30:07 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id B2E6EC8D
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  1 Jan 2014 04:30:07 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id A09151309
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  1 Jan 2014 04:30:07 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s014U6sD071160
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 1 Jan 2014 04:30:06 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s014U606071143;
	Wed, 1 Jan 2014 04:30:06 GMT
	(envelope-from nobody)
Message-Id: <201401010430.s014U606071143@oldred.freebsd.org>
Date: Wed, 1 Jan 2014 04:30:06 GMT
From: Loganaden Velvindron <logan@elandsys.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: missing description in rights(4) man page
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185382
>Category:       docs
>Synopsis:       missing description in rights(4) man page
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 01 04:40:00 UTC 2014
>Closed-Date:    Thu Feb 13 10:25:49 CET 2014
>Last-Modified:  Thu Feb 13 09:30:00 UTC 2014
>Originator:     Loganaden Velvindron
>Release:        FreeBSD fbsd 10.0-RC3
>Organization:
Wandering Samurai
>Environment:
FreeBSD fbsd 10.0-RC3 FreeBSD 10.0-RC3 #0 r259778: Tue Dec 24 04:35:46 UTC 2013     root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
CAP_EVENT_POLL is missing in rights(4).

Further examination shows that it's an alias to CAP_EVENT
>How-To-Repeat:
man 4 rights
>Fix:
--- /usr/src/share/man/man4/rights.4.orig       2014-01-01 04:19:40.000000000 +0400
+++ /usr/src/share/man/man4/rights.4    2014-01-01 04:23:02.000000000 +0400
@@ -142,6 +142,9 @@ Permit
 and
 .Xr kevent 2
 to be used in monitoring the file descriptor for events.
+.It Dv CAP_EVENT_POLL
+An alias to
+.Dv CAP_EVENT .
 .It Dv CAP_EXTATTR_DELETE
 Permit
 .Xr extattr_delete_fd 2 .


>Release-Note:
>Audit-Trail:

From: Loganaden Velvindron <logan@elandsys.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-doc@FreeBSD.org
Cc: pjd@FreeBSD.org
Subject: Re: docs/185382: missing description in rights(4) man page
Date: Thu, 2 Jan 2014 13:43:03 -0800

 Based on discussions with pjd@, it's better to change the dhclient
 to use CAP_EVENT instead of CAP_EVENT_POLL as the latter has been
 deprecated.
 
 --- bpf.c.orig	2014-01-02 21:37:12.000000000 +0400
 +++ bpf.c	2014-01-02 21:37:38.000000000 +0400
 @@ -269,7 +269,7 @@ if_register_receive(struct interface_inf
  	if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0)
  		error("Cannot lock bpf");
  
 -	cap_rights_init(&rights, CAP_IOCTL, CAP_POLL_EVENT, CAP_READ);
 +	cap_rights_init(&rights, CAP_IOCTL, CAP_EVENT, CAP_READ);
  	if (cap_rights_limit(info->rfdesc, &rights) < 0 && errno != ENOSYS)
  		error("Can't limit bpf descriptor: %m");
  	if (cap_ioctls_limit(info->rfdesc, cmds, 2) < 0 && errno != ENOSYS)
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Thu Feb 6 22:37:25 CET 2014 
State-Changed-Why:  
I committed a little bigger patch that moves all instances of CAP_POLL_EVENT 
to CAP_EVENT, will merge to 10-STABLE soon.  Thanks for the report and prodding! 


Responsible-Changed-From-To: freebsd-doc->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Thu Feb 6 22:37:25 CET 2014 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185382 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/185382: commit references a PR
Date: Thu,  6 Feb 2014 21:36:23 +0000 (UTC)

 Author: brueffer
 Date: Thu Feb  6 21:36:14 2014
 New Revision: 261566
 URL: http://svnweb.freebsd.org/changeset/base/261566
 
 Log:
   Use CAP_EVENT instead of the deprecated CAP_POLL_EVENT.
   
   PR:		185382 (based on)
   Submitted by:	Loganaden Velvindron
   Reviewed by:	pjd
   MFC after:	1 week
 
 Modified:
   head/sbin/dhclient/bpf.c
   head/sbin/dhclient/dhclient.c
   head/tools/regression/security/cap_test/cap_test_capabilities.c
 
 Modified: head/sbin/dhclient/bpf.c
 ==============================================================================
 --- head/sbin/dhclient/bpf.c	Thu Feb  6 20:35:33 2014	(r261565)
 +++ head/sbin/dhclient/bpf.c	Thu Feb  6 21:36:14 2014	(r261566)
 @@ -269,7 +269,7 @@ if_register_receive(struct interface_inf
  	if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0)
  		error("Cannot lock bpf");
  
 -	cap_rights_init(&rights, CAP_IOCTL, CAP_POLL_EVENT, CAP_READ);
 +	cap_rights_init(&rights, CAP_IOCTL, CAP_EVENT, CAP_READ);
  	if (cap_rights_limit(info->rfdesc, &rights) < 0 && errno != ENOSYS)
  		error("Can't limit bpf descriptor: %m");
  	if (cap_ioctls_limit(info->rfdesc, cmds, 2) < 0 && errno != ENOSYS)
 
 Modified: head/sbin/dhclient/dhclient.c
 ==============================================================================
 --- head/sbin/dhclient/dhclient.c	Thu Feb  6 20:35:33 2014	(r261565)
 +++ head/sbin/dhclient/dhclient.c	Thu Feb  6 21:36:14 2014	(r261566)
 @@ -494,7 +494,7 @@ main(int argc, char *argv[])
  		add_protocol("AF_ROUTE", routefd, routehandler, ifi);
  	if (shutdown(routefd, SHUT_WR) < 0)
  		error("can't shutdown route socket: %m");
 -	cap_rights_init(&rights, CAP_POLL_EVENT, CAP_READ);
 +	cap_rights_init(&rights, CAP_EVENT, CAP_READ);
  	if (cap_rights_limit(routefd, &rights) < 0 && errno != ENOSYS)
  		error("can't limit route socket: %m");
  
 
 Modified: head/tools/regression/security/cap_test/cap_test_capabilities.c
 ==============================================================================
 --- head/tools/regression/security/cap_test/cap_test_capabilities.c	Thu Feb  6 20:35:33 2014	(r261565)
 +++ head/tools/regression/security/cap_test/cap_test_capabilities.c	Thu Feb  6 21:36:14 2014	(r261566)
 @@ -396,7 +396,7 @@ try_file_ops(int filefd, int dirfd, cap_
  	pollfd.revents = 0;
  
  	ret = poll(&pollfd, 1, 0);
 -	if (rights & CAP_POLL_EVENT)
 +	if (rights & CAP_EVENT)
  		CHECK((pollfd.revents & POLLNVAL) == 0);
  	else
  		CHECK((pollfd.revents & POLLNVAL) != 0);
 @@ -546,7 +546,7 @@ test_capabilities(void)
  	TRY(CAP_SEM_POST);
  	TRY(CAP_SEM_WAIT);
  	TRY(CAP_POST_EVENT);
 -	TRY(CAP_POLL_EVENT);
 +	TRY(CAP_EVENT);
  	TRY(CAP_IOCTL);
  	TRY(CAP_TTYHOOK);
  	TRY(CAP_PDGETPID);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Thu Feb 13 10:25:13 CET 2014 
State-Changed-Why:  
Merge to 10-STABLE done.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185382 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/185382: commit references a PR
Date: Thu, 13 Feb 2014 09:24:54 +0000 (UTC)

 Author: brueffer
 Date: Thu Feb 13 09:24:46 2014
 New Revision: 261828
 URL: http://svnweb.freebsd.org/changeset/base/261828
 
 Log:
   MFC: r261566
   
   Use CAP_EVENT instead of the deprecated CAP_POLL_EVENT.
   
   PR:		185382 (based on)
   Submitted by:	Loganaden Velvindron
   Reviewed by:	pjd
 
 Modified:
   stable/10/sbin/dhclient/bpf.c
   stable/10/sbin/dhclient/dhclient.c
   stable/10/tools/regression/security/cap_test/cap_test_capabilities.c
 Directory Properties:
   stable/10/   (props changed)
 
 Modified: stable/10/sbin/dhclient/bpf.c
 ==============================================================================
 --- stable/10/sbin/dhclient/bpf.c	Thu Feb 13 09:09:14 2014	(r261827)
 +++ stable/10/sbin/dhclient/bpf.c	Thu Feb 13 09:24:46 2014	(r261828)
 @@ -269,7 +269,7 @@ if_register_receive(struct interface_inf
  	if (ioctl(info->rfdesc, BIOCLOCK, NULL) < 0)
  		error("Cannot lock bpf");
  
 -	cap_rights_init(&rights, CAP_IOCTL, CAP_POLL_EVENT, CAP_READ);
 +	cap_rights_init(&rights, CAP_IOCTL, CAP_EVENT, CAP_READ);
  	if (cap_rights_limit(info->rfdesc, &rights) < 0 && errno != ENOSYS)
  		error("Can't limit bpf descriptor: %m");
  	if (cap_ioctls_limit(info->rfdesc, cmds, 2) < 0 && errno != ENOSYS)
 
 Modified: stable/10/sbin/dhclient/dhclient.c
 ==============================================================================
 --- stable/10/sbin/dhclient/dhclient.c	Thu Feb 13 09:09:14 2014	(r261827)
 +++ stable/10/sbin/dhclient/dhclient.c	Thu Feb 13 09:24:46 2014	(r261828)
 @@ -494,7 +494,7 @@ main(int argc, char *argv[])
  		add_protocol("AF_ROUTE", routefd, routehandler, ifi);
  	if (shutdown(routefd, SHUT_WR) < 0)
  		error("can't shutdown route socket: %m");
 -	cap_rights_init(&rights, CAP_POLL_EVENT, CAP_READ);
 +	cap_rights_init(&rights, CAP_EVENT, CAP_READ);
  	if (cap_rights_limit(routefd, &rights) < 0 && errno != ENOSYS)
  		error("can't limit route socket: %m");
  
 
 Modified: stable/10/tools/regression/security/cap_test/cap_test_capabilities.c
 ==============================================================================
 --- stable/10/tools/regression/security/cap_test/cap_test_capabilities.c	Thu Feb 13 09:09:14 2014	(r261827)
 +++ stable/10/tools/regression/security/cap_test/cap_test_capabilities.c	Thu Feb 13 09:24:46 2014	(r261828)
 @@ -396,7 +396,7 @@ try_file_ops(int filefd, int dirfd, cap_
  	pollfd.revents = 0;
  
  	ret = poll(&pollfd, 1, 0);
 -	if (rights & CAP_POLL_EVENT)
 +	if (rights & CAP_EVENT)
  		CHECK((pollfd.revents & POLLNVAL) == 0);
  	else
  		CHECK((pollfd.revents & POLLNVAL) != 0);
 @@ -546,7 +546,7 @@ test_capabilities(void)
  	TRY(CAP_SEM_POST);
  	TRY(CAP_SEM_WAIT);
  	TRY(CAP_POST_EVENT);
 -	TRY(CAP_POLL_EVENT);
 +	TRY(CAP_EVENT);
  	TRY(CAP_IOCTL);
  	TRY(CAP_TTYHOOK);
  	TRY(CAP_PDGETPID);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
