From owner-svn-src-stable-12@freebsd.org  Tue Sep 29 01:56:22 2020
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@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 8BAC73F1FF2;
 Tue, 29 Sep 2020 01:56:22 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (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 "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C0jD639Qkz47p3;
 Tue, 29 Sep 2020 01:56:22 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5051C27505;
 Tue, 29 Sep 2020 01:56:22 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08T1uMTt077277;
 Tue, 29 Sep 2020 01:56:22 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08T1uMVe077276;
 Tue, 29 Sep 2020 01:56:22 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <202009290156.08T1uMVe077276@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 29 Sep 2020 01:56:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r366240 - stable/12/libexec/ftpd
X-SVN-Group: stable-12
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: stable/12/libexec/ftpd
X-SVN-Commit-Revision: 366240
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Sep 2020 01:56:22 -0000

Author: markj
Date: Tue Sep 29 01:56:21 2020
New Revision: 366240
URL: https://svnweb.freebsd.org/changeset/base/366240

Log:
  MFC r366003:
  ftpd: Add missing braces around a statfd check

Modified:
  stable/12/libexec/ftpd/ftpd.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/ftpd/ftpd.c
==============================================================================
--- stable/12/libexec/ftpd/ftpd.c	Tue Sep 29 01:54:04 2020	(r366239)
+++ stable/12/libexec/ftpd/ftpd.c	Tue Sep 29 01:56:21 2020	(r366240)
@@ -1530,7 +1530,7 @@ skip:
 	setusercontext(lc, pw, 0, LOGIN_SETRESOURCES);
 #endif
 
-	if (guest && stats && statfd < 0)
+	if (guest && stats && statfd < 0) {
 #ifdef VIRTUAL_HOSTING
 		statfd = open(thishost->statfile, O_WRONLY|O_APPEND);
 #else
@@ -1538,6 +1538,7 @@ skip:
 #endif
 		if (statfd < 0)
 			stats = 0;
+	}
 
 	/*
 	 * For a chrooted local user,