From owner-p4-projects@FreeBSD.ORG  Tue Jul 14 07:04:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B61B31065675; Tue, 14 Jul 2009 07:04:16 +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 75F1C106566B
	for <perforce@FreeBSD.org>; Tue, 14 Jul 2009 07:04:16 +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 62FD28FC08
	for <perforce@FreeBSD.org>; Tue, 14 Jul 2009 07:04:16 +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 n6E74Gb8035982
	for <perforce@FreeBSD.org>; Tue, 14 Jul 2009 07:04:16 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6E74GEo035980
	for perforce@freebsd.org; Tue, 14 Jul 2009 07:04:16 GMT
	(envelope-from jona@FreeBSD.org)
Date: Tue, 14 Jul 2009 07:04:16 GMT
Message-Id: <200907140704.n6E74GEo035980@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 166065 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: Tue, 14 Jul 2009 07:04:18 -0000

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

Change 166065 by jona@jona-trustedbsd-belle-vmware on 2009/07/14 07:03:47

	Iterate through clients in only ONE place

Affected files ...

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

Differences ...

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

@@ -293,22 +293,15 @@
 
 	if(bytes < 0) return -1;
 
-	for(struct client *client = clients; client; client = client->next)
+	int ret = handle_request(client, req);
+	if(ret)
 	{
-		int ret = handle_request(client, req);
-		if(ret)
-		{
-			int close_connection = (ret < 0);
-			client_error(client, "Error handling client request",
-			             errno, close_connection);
-			return ret;
-		}
-		else return 0;
-
+		int close_connection = (ret < 0);
+		client_error(client, "Error handling client request",
+		             errno, close_connection);
+		return ret;
 	}
-
-	fprintf(stderr, "No clients defined\n");
-	return -1;
+	else return 0;
 }
 
 
@@ -328,7 +321,7 @@
 	else if(!(client->policy_callback(client, req, datum)))
 	{
 		errno = EPERM;
-		return -1;
+		return 1;
 	}
 
 	int retval;
@@ -438,7 +431,8 @@
 }
 
 
-void client_error(struct client *client, const char *message, int errnum, int close_connection)
+void client_error(struct client *client, const char *message, int errnum,
+                  int close_connection)
 {
 	fprintf(stderr, "%s: %i (%s)\n",
 	                 message, errnum, strerror(errnum));