diff mbox

policycoreutils: newrole: add missing defined in #if

Message ID 1453220308-2967-1-git-send-email-nicolas.iooss@m4x.org (mailing list archive)
State Accepted
Headers show

Commit Message

Nicolas Iooss Jan. 19, 2016, 4:18 p.m. UTC
When building newrole with gcc 5.3.0 and some warning flags, the
compiler reports:

  newrole.c:77:33: error: "NAMESPACE_PRIV" is not defined [-Werror=undef]
  #if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV)
                                  ^

Indeed, "defined" is missing here.  This nevertheless worked so far
because when NAMESPACE_PRIV was selected in the Makefile, newrole.c was
compiled with "-DNAMESPACE_PRIV", which defined NAMESPACE_PRIV to 1.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 policycoreutils/newrole/newrole.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steve Lawrence Feb. 1, 2016, 2:14 p.m. UTC | #1
On 01/19/2016 11:18 AM, Nicolas Iooss wrote:
> When building newrole with gcc 5.3.0 and some warning flags, the
> compiler reports:
> 
>   newrole.c:77:33: error: "NAMESPACE_PRIV" is not defined [-Werror=undef]
>   #if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV)
>                                   ^
> 
> Indeed, "defined" is missing here.  This nevertheless worked so far
> because when NAMESPACE_PRIV was selected in the Makefile, newrole.c was
> compiled with "-DNAMESPACE_PRIV", which defined NAMESPACE_PRIV to 1.
> 
> Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>

Patch applied. Thanks!

- Steve

> ---
>  policycoreutils/newrole/newrole.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c
> index 65a945d3d3f3..c6544eed07b9 100644
> --- a/policycoreutils/newrole/newrole.c
> +++ b/policycoreutils/newrole/newrole.c
> @@ -74,7 +74,7 @@
>  #ifdef USE_AUDIT
>  #include <libaudit.h>
>  #endif
> -#if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV)
> +#if defined(AUDIT_LOG_PRIV) || defined(NAMESPACE_PRIV)
>  #include <sys/prctl.h>
>  #include <cap-ng.h>
>  #endif
>
diff mbox

Patch

diff --git a/policycoreutils/newrole/newrole.c b/policycoreutils/newrole/newrole.c
index 65a945d3d3f3..c6544eed07b9 100644
--- a/policycoreutils/newrole/newrole.c
+++ b/policycoreutils/newrole/newrole.c
@@ -74,7 +74,7 @@ 
 #ifdef USE_AUDIT
 #include <libaudit.h>
 #endif
-#if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV)
+#if defined(AUDIT_LOG_PRIV) || defined(NAMESPACE_PRIV)
 #include <sys/prctl.h>
 #include <cap-ng.h>
 #endif