From owner-svn-src-all@FreeBSD.ORG Tue Sep 4 11:50:14 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CAB3106564A; Tue, 4 Sep 2012 11:50:14 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 57B2C8FC16; Tue, 4 Sep 2012 11:50:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q84BoEPt049176; Tue, 4 Sep 2012 11:50:14 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84BoEqC049173; Tue, 4 Sep 2012 11:50:14 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201209041150.q84BoEqC049173@svn.freebsd.org> From: Edward Tomasz Napierala Date: Tue, 4 Sep 2012 11:50:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240084 - head/bin/setfacl 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 11:50:14 -0000 Author: trasz Date: Tue Sep 4 11:50:13 2012 New Revision: 240084 URL: http://svn.freebsd.org/changeset/base/240084 Log: Make "setfacl -bd" an alias for "setfacl -k". Previously it would crash on assert. PR: bin/165807 MFC after: 1 month Modified: head/bin/setfacl/setfacl.c Modified: head/bin/setfacl/setfacl.c ============================================================================== --- head/bin/setfacl/setfacl.c Tue Sep 4 11:43:00 2012 (r240083) +++ head/bin/setfacl/setfacl.c Tue Sep 4 11:50:13 2012 (r240084) @@ -264,6 +264,17 @@ main(int argc, char *argv[]) need_mask = 1; break; case OP_REMOVE_EXT: + /* + * Don't try to call remove_ext() for empty + * default ACL. + */ + if (acl_type == ACL_TYPE_DEFAULT && + acl_get_entry(acl, ACL_FIRST_ENTRY, + &unused_entry) == 0) { + local_error += remove_default(&acl, + file->filename); + break; + } remove_ext(&acl, file->filename); need_mask = 0; break;