From owner-svn-src-head@freebsd.org  Mon Jun  1 01:37:52 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C4CE52F81B6
 for <svn-src-head@mailman.nyi.freebsd.org>;
 Mon,  1 Jun 2020 01:37:52 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49ZyV84rqnz4L1N
 for <svn-src-head@freebsd.org>; Mon,  1 Jun 2020 01:37:52 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com
 [209.85.219.49])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 9B1862AC45
 for <svn-src-head@freebsd.org>; Mon,  1 Jun 2020 01:37:52 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-qv1-f49.google.com with SMTP id dp10so3754609qvb.10
 for <svn-src-head@freebsd.org>; Sun, 31 May 2020 18:37:52 -0700 (PDT)
X-Gm-Message-State: AOAM5326ZXF4wyFlUB5HMSHcu5YPJZ6Pkn64wjlyPueiaQiFF3h8f4X2
 RC4rW0jAIMp9NHLWrLMyKhLTjRodRX+3V2sibYI=
X-Received: by 2002:a0c:c2c2:: with SMTP id c2mt18683534qvi.150.1590975472201; 
 Sun, 31 May 2020 18:37:52 -0700 (PDT)
MIME-Version: 1.0
References: <202006010125.0511PJw3044666@repo.freebsd.org>
In-Reply-To: <202006010125.0511PJw3044666@repo.freebsd.org>
From: Kyle Evans <kevans@freebsd.org>
Date: Sun, 31 May 2020 20:37:41 -0500
X-Gmail-Original-Message-ID: <CACNAnaGcoHezwT1PEJj8rtbGZunjWE5E9PTEPm+L6ymtPXP3dQ@mail.gmail.com>
Message-ID: <CACNAnaGcoHezwT1PEJj8rtbGZunjWE5E9PTEPm+L6ymtPXP3dQ@mail.gmail.com>
Subject: Re: svn commit: r361683 - head/usr.sbin/certctl
Cc: src-committers <src-committers@freebsd.org>,
 svn-src-all <svn-src-all@freebsd.org>, 
 svn-src-head <svn-src-head@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2020 01:37:52 -0000

n Sun, May 31, 2020 at 8:25 PM Kyle Evans <kevans@freebsd.org> wrote:
>
> Author: kevans
> Date: Mon Jun  1 01:25:19 2020
> New Revision: 361683
> URL: https://svnweb.freebsd.org/changeset/base/361683
>
> Log:
>   certctl: fix test syntax
>
>   test doesn't understand &&, but it does understand -a.
>
>   MFC after:    1 week
>

Sorry, this was a pretty low-quality commit message; && is a shell
construct, so the previous version lead to a lot of spam as the [
invocation was split and the ] terminator lost.

> Modified:
>   head/usr.sbin/certctl/certctl.sh
>
> Modified: head/usr.sbin/certctl/certctl.sh
> ==============================================================================
> --- head/usr.sbin/certctl/certctl.sh    Sun May 31 22:46:32 2020        (r361682)
> +++ head/usr.sbin/certctl/certctl.sh    Mon Jun  1 01:25:19 2020        (r361683)
> @@ -102,7 +102,7 @@ do_scan()
>                 [ -d "$CPATH" ] || continue
>                 echo "Scanning $CPATH for certificates..."
>                 for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
> -                       [ -e "$CPATH/$CFILE" && $UNPRIV -eq 0 ] || continue
> +                       [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue
>                         [ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
>                         "$CFUNC" "$CPATH/$CFILE"
>                 done