From owner-p4-projects@FreeBSD.ORG Wed Aug 13 13:58:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AE8D1065681; Wed, 13 Aug 2008 13:58:17 +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 3C5261065688 for ; Wed, 13 Aug 2008 13:58:17 +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 343058FC1E for ; Wed, 13 Aug 2008 13:58:17 +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 m7DDwHPa048020 for ; Wed, 13 Aug 2008 13:58:17 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7DDwH4K048018 for perforce@freebsd.org; Wed, 13 Aug 2008 13:58:17 GMT (envelope-from trasz@freebsd.org) Date: Wed, 13 Aug 2008 13:58:17 GMT Message-Id: <200808131358.m7DDwH4K048018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 147298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2008 13:58:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=147298 Change 147298 by trasz@trasz_traszkan on 2008/08/13 13:57:57 Relax two overly restrictive checks that prevented old ACLs to be longer than 31 instead of 32. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#12 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#12 (text+ko) ==== @@ -71,7 +71,7 @@ { int i; - if (source->acl_cnt < 0 || source->acl_cnt >= OLDACL_MAX_ENTRIES) + if (source->acl_cnt < 0 || source->acl_cnt > OLDACL_MAX_ENTRIES) return (EINVAL); bzero(dest, sizeof(*dest)); @@ -82,8 +82,6 @@ dest->acl_entry[i].ae_tag = source->acl_entry[i].ae_tag; dest->acl_entry[i].ae_id = source->acl_entry[i].ae_id; dest->acl_entry[i].ae_perm = source->acl_entry[i].ae_perm; - dest->acl_entry[i].ae_extended = ACL_EXTENDED_ALLOW; - dest->acl_entry[i].ae_flags = 0; } return (0); @@ -94,7 +92,7 @@ { int i; - if (source->acl_cnt < 0 || source->acl_cnt >= OLDACL_MAX_ENTRIES) + if (source->acl_cnt < 0 || source->acl_cnt > OLDACL_MAX_ENTRIES) return (EINVAL); bzero(dest, sizeof(*dest));