Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262450
b: refs/heads/master
c: 82c21bf
h: refs/heads/master
v: v3
  • Loading branch information
Paul Moore authored and David S. Miller committed Aug 2, 2011
1 parent 7b41b74 commit dae8754
Show file tree
Hide file tree
Showing 33 changed files with 32 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87a0874cf19f1bc9bd25bd7d053a0ea25ccf8373
refs/heads/master: 82c21bfab41a77bc01affe21bea9727d776774a7
2 changes: 1 addition & 1 deletion trunk/include/net/cipso_ipv4.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* have chosen to adopt the protocol and over the years it has become a
* de-facto standard for labeled networking.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/include/net/netlabel.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* The NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 0 additions & 2 deletions trunk/net/netlabel/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#
# Makefile for the NetLabel subsystem.
#
# Feb 9, 2006, Paul Moore <paul.moore@hp.com>
#

# base objects
obj-y := netlabel_user.o netlabel_kapi.o
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_addrlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_addrlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_cipso_v4.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_cipso_v4.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_domainhash.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_domainhash.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_kapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* system manages static and dynamic label mappings for network protocols such
* as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_mgmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_unlabeled.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system. The NetLabel system manages static and dynamic label
* mappings for network protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_unlabeled.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system. The NetLabel system manages static and dynamic label
* mappings for network protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/netlabel/netlabel_user.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* NetLabel system manages static and dynamic label mappings for network
* protocols such as CIPSO and RIPSO.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
* <dgoeddel@trustedcs.com>
* Copyright (C) 2006, 2007, 2009 Hewlett-Packard Development Company, L.P.
* Paul Moore <paul.moore@hp.com>
* Paul Moore <paul@paul-moore.com>
* Copyright (C) 2007 Hitachi Software Engineering Co., Ltd.
* Yuichi Nakamura <ynakam@hitachisoft.jp>
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/include/netif.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com>
* Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
* Paul Moore, <paul.moore@hp.com>
* Paul Moore <paul@paul-moore.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/include/netlabel.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SELinux interface to the NetLabel subsystem
*
* Author : Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/include/netnode.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* needed to reduce the lookup overhead since most of these queries happen on
* a per-packet basis.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/include/netport.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* mapping is maintained as part of the normal policy but a fast cache is
* needed to reduce the lookup overhead.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/netif.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* Copyright (C) 2003 Red Hat, Inc., James Morris <jmorris@redhat.com>
* Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
* Paul Moore <paul.moore@hp.com>
* Paul Moore <paul@paul-moore.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2,
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/netlabel.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* This file provides the necessary glue to tie NetLabel into the SELinux
* subsystem.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
*/

Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/netnode.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* needed to reduce the lookup overhead since most of these queries happen on
* a per-packet basis.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
* This code is heavily based on the "netif" concept originally developed by
* James Morris <jmorris@redhat.com>
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/netport.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* mapping is maintained as part of the normal policy but a fast cache is
* needed to reduce the lookup overhead.
*
* Author: Paul Moore <paul.moore@hp.com>
* Author: Paul Moore <paul@paul-moore.com>
*
* This code is heavily based on the "netif" concept originally developed by
* James Morris <jmorris@redhat.com>
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/selinuxfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* Added conditional policy language extensions
*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support for the policy capability bitmap
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/ss/ebitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Author : Stephen Smalley, <sds@epoch.ncsc.mil>
*/
/*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support to import/export the NetLabel category bitmap
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/ss/mls.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
*/
/*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support to import/export the MLS label from NetLabel
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/ss/mls.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
*/
/*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support to import/export the MLS label from NetLabel
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/ss/policydb.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* Added conditional policy language extensions
*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support for the policy capability bitmap
*
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/selinux/ss/services.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* Added conditional policy language extensions
*
* Updated: Hewlett-Packard <paul.moore@hp.com>
* Updated: Hewlett-Packard <paul@paul-moore.com>
*
* Added support for NetLabel
* Added support for the policy capability bitmap
Expand Down
2 changes: 1 addition & 1 deletion trunk/security/smack/smack_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Copyright (C) 2007 Casey Schaufler <casey@schaufler-ca.com>
* Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
* Paul Moore <paul.moore@hp.com>
* Paul Moore <paul@paul-moore.com>
* Copyright (C) 2010 Nokia Corporation
*
* This program is free software; you can redistribute it and/or modify
Expand Down

0 comments on commit dae8754

Please sign in to comment.