From owner-svn-src-all@FreeBSD.ORG  Thu May 20 18:46:11 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA4951065673;
	Thu, 20 May 2010 18:46:11 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A95028FC2A;
	Thu, 20 May 2010 18:46:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4KIkBeO078275;
	Thu, 20 May 2010 18:46:11 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4KIkB0t078273;
	Thu, 20 May 2010 18:46:11 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201005201846.o4KIkB0t078273@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 20 May 2010 18:46:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208359 - stable/8/lib/libc/posix1e
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 May 2010 18:46:11 -0000

Author: trasz
Date: Thu May 20 18:46:11 2010
New Revision: 208359
URL: http://svn.freebsd.org/changeset/base/208359

Log:
  MFC r208034:
  
  Make branding less intrusive - in acl_set(3), in case ACL brand
  is ACL_BRAND_UNKNOWN, do what the programmer says instead of failing.

Modified:
  stable/8/lib/libc/posix1e/acl_branding.c
Directory Properties:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)

Modified: stable/8/lib/libc/posix1e/acl_branding.c
==============================================================================
--- stable/8/lib/libc/posix1e/acl_branding.c	Thu May 20 18:45:07 2010	(r208358)
+++ stable/8/lib/libc/posix1e/acl_branding.c	Thu May 20 18:46:11 2010	(r208359)
@@ -129,6 +129,9 @@ _acl_type_not_valid_for_acl(const acl_t 
 		if (type == ACL_TYPE_ACCESS || type == ACL_TYPE_DEFAULT)
 			return (0);
 		break;
+
+	case ACL_BRAND_UNKNOWN:
+		return (0);
 	}
 
 	return (-1);