From patchwork Thu Apr 28 06:53:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 12830051 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82FE6C433FE for ; Thu, 28 Apr 2022 06:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244598AbiD1G5R (ORCPT ); Thu, 28 Apr 2022 02:57:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244597AbiD1G5Q (ORCPT ); Thu, 28 Apr 2022 02:57:16 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0B694986C1 for ; Wed, 27 Apr 2022 23:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651128842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r/taJ9sE0u0byJCX8Eni1IyaMwiCBepL38AsaKItU+M=; b=TL5IlQf/5/p9Dc/ZJ4bt+Pz1veIjz7Vnl2xGfNG8csxNdm2EVTj/BBnj6JzaU8n0M2BVB2 XOIh6T11y4eneY8HD3SHpI7MS0PkyiNipk96QjVCY6JGodbD+Gcel4ZzpCFadMRnywGufJ ia2TrNMRSGsDN+FoZw6sHfB/FhaJcJI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-201-QlLvAVnnNjivq7i7qyRn_Q-1; Thu, 28 Apr 2022 02:54:00 -0400 X-MC-Unique: QlLvAVnnNjivq7i7qyRn_Q-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A764185A7A4 for ; Thu, 28 Apr 2022 06:54:00 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (unknown [10.39.192.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A0F7416384; Thu, 28 Apr 2022 06:53:58 +0000 (UTC) From: Laszlo Ersek To: SELinux List , Laszlo Ersek Cc: "Richard W.M. Jones" , Petr Lautrbach Subject: [PATCH for-3.5 1/5] setfiles: fix up inconsistent indentation Date: Thu, 28 Apr 2022 08:53:50 +0200 Message-Id: <20220428065354.27605-2-lersek@redhat.com> In-Reply-To: <20220428065354.27605-1-lersek@redhat.com> References: <20220428065354.27605-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Commit 7ad84e7c8d4f ("Add restorecon -x option to not cross FS boundaries", 2020-06-18) used spaces vs. TABs inconsistently; run "unexpand" on the affected lines to make the indentation conform to the rest of the source code. Cc: "Richard W.M. Jones" Cc: Petr Lautrbach Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1794518 Signed-off-by: Laszlo Ersek --- policycoreutils/setfiles/setfiles.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/policycoreutils/setfiles/setfiles.c b/policycoreutils/setfiles/setfiles.c index ab7016aca9a6..be88be5d5497 100644 --- a/policycoreutils/setfiles/setfiles.c +++ b/policycoreutils/setfiles/setfiles.c @@ -368,13 +368,13 @@ int main(int argc, char **argv) case '0': null_terminated = 1; break; - case 'x': - if (iamrestorecon) { + case 'x': + if (iamrestorecon) { r_opts.xdev = SELINUX_RESTORECON_XDEV; - } else { + } else { usage(argv[0]); - } - break; + } + break; case 'T': nthreads = strtoull(optarg, &endptr, 10); if (*optarg == '\0' || *endptr != '\0')