From owner-p4-projects@FreeBSD.ORG  Wed Jun 24 08:36:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7A37B1065677; Wed, 24 Jun 2009 08:36:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6F4A1065672
	for <perforce@FreeBSD.org>; Wed, 24 Jun 2009 08:36:50 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B55338FC24
	for <perforce@FreeBSD.org>; Wed, 24 Jun 2009 08:36:50 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5O8aomZ055769
	for <perforce@FreeBSD.org>; Wed, 24 Jun 2009 08:36:50 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5O8ao5m055767
	for perforce@freebsd.org; Wed, 24 Jun 2009 08:36:50 GMT
	(envelope-from jona@FreeBSD.org)
Date: Wed, 24 Jun 2009 08:36:50 GMT
Message-Id: <200906240836.n5O8ao5m055767@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 165030 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2009 08:36:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=165030

Change 165030 by jona@jona-trustedbsd-belle-vmware on 2009/06/24 08:35:58

	Removed some commented-out code

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/server.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/user_angel/server.c#11 (text+ko) ====

@@ -138,12 +138,6 @@
 
 
 
-
-/*
-	TODO: do this?
-		rc = setsockopt(listen_sd, SOL_SOCKET,  SO_REUSEADDR,
-                   (char *)&on, sizeof(on));*/
-
 	if(bind(fd, (struct sockaddr*) &addr, sizeof(struct sockaddr_un)))
 	{
 		if(shutting_down) return 0;
@@ -163,21 +157,6 @@
 		return -1;
 	}
 
-
-	// non-blocking socket I/O
-/*	int flags = fcntl(fd, F_GETFL, 0);
-	if(flags < 0)
-	{
-		perror("Error getting flags for control socket");
-		return -1;
-	}
-
-	if(fcntl(fd, F_SETFL, flags | O_NONBLOCK))
-	{
-		perror("Error setting flags on control socket");
-		return -1;
-	}*/
-
 	FD_SET(fd, &clients);