From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Gruenbacher Newsgroups: gmane.emacs.bugs Subject: bug#20681: [PATCH] acl-permissions: Fix build on Mac OS X and older AIX (Bug#20681) Date: Fri, 29 May 2015 21:06:08 +0200 Message-ID: <1432926368-5092-1-git-send-email-andreas.gruenbacher__21262.7084031285$1432926494$gmane$org@gmail.com> References: <55689A39.7080804@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432926494 20986 80.91.229.3 (29 May 2015 19:08:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 29 May 2015 19:08:14 +0000 (UTC) To: bug-gnulib@gnu.org, 20681@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 29 21:07:59 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YyPdH-0004cx-VA for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 May 2015 21:07:52 +0200 Original-Received: from localhost ([::1]:37457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyPdH-0002aP-AO for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 May 2015 15:07:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyPcY-000154-OP for bug-gnu-emacs@gnu.org; Fri, 29 May 2015 15:07:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyPcU-0002Qm-OQ for bug-gnu-emacs@gnu.org; Fri, 29 May 2015 15:07:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:50876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyPcU-0002Qi-L5 for bug-gnu-emacs@gnu.org; Fri, 29 May 2015 15:07:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YyPcU-0007z1-1P for bug-gnu-emacs@gnu.org; Fri, 29 May 2015 15:07:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Andreas Gruenbacher Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 29 May 2015 19:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20681 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20681-submit@debbugs.gnu.org id=B20681.143292639830655 (code B ref 20681); Fri, 29 May 2015 19:07:01 +0000 Original-Received: (at 20681) by debbugs.gnu.org; 29 May 2015 19:06:38 +0000 Original-Received: from localhost ([127.0.0.1]:60851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YyPc5-0007yN-E8 for submit@debbugs.gnu.org; Fri, 29 May 2015 15:06:37 -0400 Original-Received: from mail-wi0-f179.google.com ([209.85.212.179]:34253) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YyPc2-0007y6-Gw for 20681@debbugs.gnu.org; Fri, 29 May 2015 15:06:35 -0400 Original-Received: by wicmc15 with SMTP id mc15so23879626wic.1 for <20681@debbugs.gnu.org>; Fri, 29 May 2015 12:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=6fPZgTkmdlfjy3IIgtxWbIPQ+7jMeQH82UsJ+NshdAg=; b=gPxMWi7VP4iGcPl52SZR7f9I5RZYeubA7ZBqw7oXLY/aWAKXNmE+XN1HBkOa1R7pTM m1vbK7tehWsM3CG1D3ZXDyqBcu9zUJRRNCSIuGlVRLHmvF9rLo2sTN3OUfwpZqFLcJgt RCDRZPi+lMy2L1Q8T7mhnx0aqnG4A4UkWtfhaWT9IPLtbm/RqMDpcAGZLpIblma5TfKw ZKCkGoqziKyIWoVey9Jk+8L4MLOp0bZG2NHOKHfEATcViA6x4DeW+eaEBd5YpG38Tzoa +hUD4NiSLFtszhWLBiGgpNRny86GZzIIAj1tWM1xq8F62ZUoJZ0X5HYp5/ipQTkQdxsc V/5g== X-Received: by 10.180.95.40 with SMTP id dh8mr9254403wib.35.1432926388937; Fri, 29 May 2015 12:06:28 -0700 (PDT) Original-Received: from nuc.home.com (80-110-112-232.cgn.dynamic.surfer.at. [80.110.112.232]) by mx.google.com with ESMTPSA id gs7sm4362411wib.10.2015.05.29.12.06.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2015 12:06:28 -0700 (PDT) X-Mailer: git-send-email 2.4.0 In-Reply-To: <55689A39.7080804@cs.ucla.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:103325 Archived-At: * lib/set-permissions.c (set_acls): Fix more errors introduced in the acl module rewrite. --- ChangeLog | 4 ++++ lib/set-permissions.c | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb8b446..a44510a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2015-05-29 Andreas Gruenbacher + acl-permissions: Fix build on Mac OS X and older AIX (Bug#20681) + * lib/set-permissions.c (set_acls): Fix more errors introduced in the acl + module rewrite. + acl-permissions: Fix build on Solaris and Cygwin Reported by Tom G. Christensen : * lib/set-permissions.c (set_acls): The count, entries, ace_count, and diff --git a/lib/set-permissions.c b/lib/set-permissions.c index db3696c..ba291f3 100644 --- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -566,7 +566,7 @@ set_acls (struct permission_context *ctx, const char *name, int desc, { acl_free (acl); - acl = acl_init (acl); + acl = acl_init (0); if (acl) { if (HAVE_ACL_SET_FD && desc != -1) @@ -582,12 +582,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc, else { if (HAVE_ACL_SET_FD && desc != -1) - ret = acl_set_fd (desc, acl); + ret = acl_set_fd (desc, ctx->acl); else - ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl); + ret = acl_set_file (name, ACL_TYPE_EXTENDED, ctx->acl); if (ret != 0) { - if (! acl_errno_valid (saved_errno) && ! acl_extended_nontrivial (acl)) + if (! acl_errno_valid (errno) + && ! acl_extended_nontrivial (ctx->acl)) ret = 0; } } @@ -696,9 +697,9 @@ set_acls (struct permission_context *ctx, const char *name, int desc, if (ret == 0 && ctx->have_u) { if (desc != -1) - ret = fchacl (desc, &u.a, u.a.acl_len); + ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len); else - ret = chacl (name, &u.a, u.a.acl_len); + ret = chacl (name, &ctx->u.a, ctx->u.a.acl_len); if (ret < 0) { if (errno == ENOSYS && from_mode) -- 2.4.0