[Maverick][pull request] sync to AppArmor mainline 2010-07-23

[John Johansen]

Ignore this one, its missing part of the update.

On 07/23/2010 01:10 PM, John Johansen wrote:
> The following changes since commit fadf5fc5a1b7fc344207e090d136b420e90424fc:
>   Leann Ogasawara (1):
>         UBUNTU: Bump ABI
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/jj/ubuntu-maverick.git apparmor
> 
> John Johansen (3):
>       UBUNTU: SAUCE: AppArmor: -- sync to AppArmor mainline 2010-07-23
>       UBUNTU: SAUCE: AppArmor 2.4 interface compatibility patch
>       UBUNTU: SAUCE: AppArmor: Allow dfa backward compatibility with broken userspace
> 
>  Documentation/kernel-parameters.txt    |    8 +++
>  MAINTAINERS                            |    8 +++
>  include/linux/lsm_audit.h              |    7 +-
>  security/Kconfig                       |    3 +
>  security/apparmor/apparmorfs-24.c      |    2 +-
>  security/apparmor/apparmorfs.c         |   59 ++----------------
>  security/apparmor/audit.c              |   59 +++++++++++--------
>  security/apparmor/capability.c         |   12 ++--
>  security/apparmor/context.c            |    4 +-
>  security/apparmor/domain.c             |   35 ++++++-----
>  security/apparmor/file.c               |   58 +++++-------------
>  security/apparmor/include/apparmor.h   |   27 ++++++---
>  security/apparmor/include/apparmorfs.h |    3 -
>  security/apparmor/include/audit.h      |    8 +--
>  security/apparmor/include/domain.h     |    2 +-
>  security/apparmor/include/file.h       |   35 +++++------
>  security/apparmor/include/match.h      |    7 --
>  security/apparmor/include/path.h       |    1 -
>  security/apparmor/include/policy.h     |   28 ++++-----
>  security/apparmor/include/procattr.h   |    2 +-
>  security/apparmor/ipc.c                |    8 +-
>  security/apparmor/lib.c                |   87 +++++++++++++++++++++-------
>  security/apparmor/lsm.c                |  101 +++++++++++--------------------
>  security/apparmor/match.c              |   85 +++++++++++----------------
>  security/apparmor/net.c                |   19 +++---
>  security/apparmor/path.c               |   88 +++++++++++++---------------
>  security/apparmor/policy.c             |   68 ++++++++++++---------
>  security/apparmor/policy_unpack.c      |   64 ++++++++++----------
>  security/apparmor/procattr.c           |    9 ++-
>  security/apparmor/resource.c           |   12 ++--
>  30 files changed, 430 insertions(+), 479 deletions(-)
> 
>