From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 19:50:33 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2CDD106566C;
	Sat, 30 Jan 2010 19:50:33 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E3A938FC16;
	Sat, 30 Jan 2010 19:50:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJoXTD091148;
	Sat, 30 Jan 2010 19:50:33 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UJoXRQ091146;
	Sat, 30 Jan 2010 19:50:33 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301950.o0UJoXRQ091146@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 19:50:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203240 - projects/capabilities8/lib/libcapability
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 19:50:34 -0000

Author: rwatson
Date: Sat Jan 30 19:50:33 2010
New Revision: 203240
URL: http://svn.freebsd.org/changeset/base/203240

Log:
  Merge c173711 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Remove duplicate bzero of msghdr.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/lib/libcapability/libcapability.c

Modified: projects/capabilities8/lib/libcapability/libcapability.c
==============================================================================
--- projects/capabilities8/lib/libcapability/libcapability.c	Sat Jan 30 19:49:14 2010	(r203239)
+++ projects/capabilities8/lib/libcapability/libcapability.c	Sat Jan 30 19:50:33 2010	(r203240)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#10 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#11 $
  */
 
 #include <sys/types.h>
@@ -179,7 +179,6 @@ _lc_send_rights(int fd, const void *msg,
 	iov.iov_base = __DECONST(void *, msg);
 	iov.iov_len = len;
 
-	bzero(&msghdr, sizeof(msghdr));
 	bzero(&cmsgbuf, sizeof(cmsgbuf));
 	cmsg = (struct cmsghdr *)cmsgbuf;
 	cmsg->cmsg_len = CMSG_SPACE(fdcount * sizeof(int));