From owner-p4-projects@FreeBSD.ORG  Mon Jul 27 11:31:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C26C91065673; Mon, 27 Jul 2009 11:31:14 +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 829B4106566B
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 11:31:14 +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 70D6D8FC08
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 11:31:14 +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 n6RBVE18062460
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 11:31:14 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6RBVEwL062458
	for perforce@freebsd.org; Mon, 27 Jul 2009 11:31:14 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 27 Jul 2009 11:31:14 GMT
Message-Id: <200907271131.n6RBVEwL062458@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 166610 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: Mon, 27 Jul 2009 11:31:15 -0000

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

Change 166610 by jona@jona-trustedbsd-belle-vmware on 2009/07/27 11:30:52

	Removed some commented-out lines, changed some printf()s

Affected files ...

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

Differences ...

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

@@ -401,7 +401,7 @@
 	int sock = client->socket;
 
 	if(ua_unmarshall_string(d, path, &pathlen) < 0) return -1;
-	printf(": %s\n", path);
+	printf(": '%s'\n", path);
 
 	struct stat s;
 	if(stat(path, &s)) return 1;
@@ -421,18 +421,14 @@
 
 int handle_path_request(struct client *client, struct ua_datum *d)
 {
-//	unsigned int fdlen = 0;
 	char path[256] = "";
 	unsigned int pathlen = 256;
 
 	int sock = client->socket;
 
-//	struct ua_datum *d = ua_recv(sock, NULL, &fdlen);
 	if(ua_unmarshall_string(d, path, &pathlen) < 0) return -1;
-//	free(d);
+	printf(": '%s'\n", path);
 
-	printf(": %s\n", path);
-
 	int32_t flags, rights;
 	if(ua_unmarshall_int(ua_recv(sock, NULL, NULL), &flags) < 0) return -1;
 	if(ua_unmarshall_int(ua_recv(sock, NULL, NULL), &rights) < 0) return -1;
@@ -485,18 +481,21 @@
 		return -1;
 	}
 
+	printf(": ");
 	for(int i = 0; i < len; i++)
 	{
 		const char *name = names[i];
 		struct ua_datum *d
 			= ua_marshall_string(name, strlen(name));
 
+		printf("'%s' ", name);
 		if(ua_send(client->socket, d, fds + i, 1) < 0)
 		{
 			printf("Error sending file descriptor");
 			return -1;
 		}
 	}
+	printf("\n");
 
 	return 0;
 }