From owner-p4-projects@FreeBSD.ORG  Tue Aug 12 07:05:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E9CC1065680; Tue, 12 Aug 2008 07:05:35 +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 62D1F106567C
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 07:05:35 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FDCC8FC16
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 07:05:35 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7C75ZQR066081
	for <perforce@freebsd.org>; Tue, 12 Aug 2008 07:05:35 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7C75Zp6066079
	for perforce@freebsd.org; Tue, 12 Aug 2008 07:05:35 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 12 Aug 2008 07:05:35 GMT
Message-Id: <200808120705.m7C75Zp6066079@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147213 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, 12 Aug 2008 07:05:35 -0000

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

Change 147213 by trasz@trasz_traszkan on 2008/08/12 07:05:16

	Improve diagnostics when reading ACL fails.  Not tested yet.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#9 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#9 (text+ko) ====

@@ -53,6 +53,7 @@
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
+#include <ufs/ffs/fs.h>
 
 #ifdef UFS_ACL
 
@@ -179,21 +180,26 @@
 		 * are unsafe.
 		 */
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL ("
-		    "%d bytes)\n", len);
+		    "%d bytes), inumber %d on %s\n", len,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
 
 	if (ap->a_aclp->acl_magic != ACL_MAGIC) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_magic: 0x%x)\n", ap->a_aclp->acl_magic);
+		    "(wrong acl_magic: 0x%x), inumber %d on %s\n",
+		    ap->a_aclp->acl_magic,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 		
 		return (EPERM);
 	}
 
 	if (ap->a_aclp->acl_cnt > ap->a_aclp->acl_length) {
 		printf("ufs_getacl_nfs4(): Loaded invalid ACL "
-		    "(wrong acl_cnt: %c)\n", ap->a_aclp->acl_cnt);
+		    "(wrong acl_cnt: %c), inumber %d on %s\n",
+		    ap->a_aclp->acl_cnt,
+		    ip->i_number, ip->i_fs->fs_fsmnt);
 
 		return (EPERM);
 	}
@@ -278,7 +284,8 @@
 				 * are unsafe.
 				 */
 				printf("ufs_getacl_posix1e(): Loaded invalid "
-				    "ACL (%d bytes)\n", len);
+				    "ACL (%d bytes), inumber %d on %s\n", len,
+				    ip->i_number, ip->i_fs->fs_fsmnt);
 				return (EPERM);
 			}
 
@@ -329,7 +336,8 @@
 				 * protections are unsafe.
 				 */
 				printf("ufs_getacl(): Loaded invalid ACL ("
-				    "%d bytes)\n", len);
+				    "%d bytes), inumber %d on %s\n", len,
+				    ip->i_number, ip->i_fs->fs_fsmnt);
 				return (EPERM);
 			}
 			break;