Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <ba47c2acb7bee9102bb6a85e9ba8b5918fa3610b.camel@yandex.ru>
 <CAHC9VhTvp3Z26JbXJdq8p4T7w3GZk-1CFWY328o75-AqqUbNTg@mail.gmail.com>
 <79d5bffd63b46bb7d54ebcef4765cfca28f76ff0.camel@yandex.ru>
 <CAHC9VhQfzx6xhZz+ghkRB2UKWHmsHKjLzz_7z3L47GHOoHLchw@mail.gmail.com>
 <20210607175058.GO447005@madcap2.tricolour.ca> <CAHC9VhS341s99jZ=rb90-hHmR2vfavhBANw_wL6oJp-hasST6Q@mail.gmail.com>
 <61bf645f5daec5f7096b0c23e5407edf4b3da8a1.camel@yandex.ru>
In-Reply-To: <61bf645f5daec5f7096b0c23e5407edf4b3da8a1.camel@yandex.ru>
From:   Paul Moore <paul@paul-moore.com>
Date:   Tue, 8 Jun 2021 22:12:13 -0400
Message-ID: <CAHC9VhT1WGThacDZ=t_yz53yQGUzzXOoFLkBSEcyNzVuAzdp5Q@mail.gmail.com>
Subject: Re: [PATCH v2] audit: Rename enum audit_state constants to avoid
 AUDIT_DISABLED redefinition
To:     Sergey Nazarov <s-nazarov@yandex.ru>
Cc:     Richard Guy Briggs <rgb@redhat.com>, linux-audit@redhat.com,
        linux-kernel@vger.kernel.org, Eric Paris <eparis@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Jun 8, 2021 at 2:32 AM Sergey Nazarov <s-nazarov@yandex.ru> wrote:
>
> AUDIT_DISABLED defined in kernel/audit.h as element of enum audit_state
> and redefined in kernel/audit.c. This produces a warning when kernel builds
> with syscalls audit disabled and brokes kernel build if -Werror used.
> enum audit_state used in syscall audit code only. This patch changes
> enum audit_state constants prefix AUDIT to AUDIT_STATE to avoid
> AUDIT_DISABLED redefinition.
>
> v2: the comments of Richard Guy Briggs and Paul Moore were taken into account
>
> Signed-off-by: Sergey Nazarov <s-nazarov@yandex.ru>
> ---
>  kernel/audit.h   |  8 ++++----
>  kernel/auditsc.c | 34 +++++++++++++++++-----------------
>  2 files changed, 21 insertions(+), 21 deletions(-)

Merged into audit/next, thanks Sergey.

-- 
paul moore
www.paul-moore.com