[apparmor] [PATCH 12/36] apparmor: merge profile mode names

[Seth Arnold]

On Wed, May 01, 2013 at 02:30:57PM -0700, John Johansen wrote:
> introspection patch introduced a second copy of profile mode names in audit
> that is not in sync with the one in policy. Merge them into a single
> entity.
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>

> diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
> index ac5bb3d..4a5f55a 100644
> --- a/security/apparmor/policy.c
> +++ b/security/apparmor/policy.c
> @@ -92,12 +92,13 @@
>  /* root profile namespace */
>  struct aa_namespace *root_ns;
>  
> -const char *const profile_mode_names[] = {
> +const char *const aa_profile_mode_names[] = {
>  	"enforce",
>  	"complain",
>  	"kill",
>  	"unconfined",
>  };
> +#define APPARMOR_NAMES_MAX_INDEX 4

You can remove this #define -- it isn't used in policy.c. (The only use
is in lsm.c, but keeping the definition in policy.h makes sense to me.)

After removing this line,

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20130510/9b86a55d/attachment.pgp>