diff options
| author | James Morris <jmorris@namei.org> | 2008-10-10 18:26:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-10 18:26:14 -0400 |
| commit | 0da939b0058742ad2d8580b7db6b966d0fc72252 (patch) | |
| tree | 47cb109fdf97135191bff5db4e3bfc905136bf8b /net/netlabel/netlabel_cipso_v4.h | |
| parent | 4bdec11f560b8f405a011288a50e65b1a81b3654 (diff) | |
| parent | d91d40799165b0c84c97e7c71fb8039494ff07dc (diff) | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.h')
| -rw-r--r-- | net/netlabel/netlabel_cipso_v4.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/netlabel/netlabel_cipso_v4.h b/net/netlabel/netlabel_cipso_v4.h index 220cb9d06b49..c8a4079261f0 100644 --- a/net/netlabel/netlabel_cipso_v4.h +++ b/net/netlabel/netlabel_cipso_v4.h | |||
| @@ -45,12 +45,13 @@ | |||
| 45 | * NLBL_CIPSOV4_A_MTYPE | 45 | * NLBL_CIPSOV4_A_MTYPE |
| 46 | * NLBL_CIPSOV4_A_TAGLST | 46 | * NLBL_CIPSOV4_A_TAGLST |
| 47 | * | 47 | * |
| 48 | * If using CIPSO_V4_MAP_STD the following attributes are required: | 48 | * If using CIPSO_V4_MAP_TRANS the following attributes are required: |
| 49 | * | 49 | * |
| 50 | * NLBL_CIPSOV4_A_MLSLVLLST | 50 | * NLBL_CIPSOV4_A_MLSLVLLST |
| 51 | * NLBL_CIPSOV4_A_MLSCATLST | 51 | * NLBL_CIPSOV4_A_MLSCATLST |
| 52 | * | 52 | * |
| 53 | * If using CIPSO_V4_MAP_PASS no additional attributes are required. | 53 | * If using CIPSO_V4_MAP_PASS or CIPSO_V4_MAP_LOCAL no additional attributes |
| 54 | * are required. | ||
| 54 | * | 55 | * |
| 55 | * o REMOVE: | 56 | * o REMOVE: |
| 56 | * Sent by an application to remove a specific DOI mapping table from the | 57 | * Sent by an application to remove a specific DOI mapping table from the |
| @@ -76,12 +77,13 @@ | |||
| 76 | * NLBL_CIPSOV4_A_MTYPE | 77 | * NLBL_CIPSOV4_A_MTYPE |
| 77 | * NLBL_CIPSOV4_A_TAGLST | 78 | * NLBL_CIPSOV4_A_TAGLST |
| 78 | * | 79 | * |
| 79 | * If using CIPSO_V4_MAP_STD the following attributes are required: | 80 | * If using CIPSO_V4_MAP_TRANS the following attributes are required: |
| 80 | * | 81 | * |
| 81 | * NLBL_CIPSOV4_A_MLSLVLLST | 82 | * NLBL_CIPSOV4_A_MLSLVLLST |
| 82 | * NLBL_CIPSOV4_A_MLSCATLST | 83 | * NLBL_CIPSOV4_A_MLSCATLST |
| 83 | * | 84 | * |
| 84 | * If using CIPSO_V4_MAP_PASS no additional attributes are required. | 85 | * If using CIPSO_V4_MAP_PASS or CIPSO_V4_MAP_LOCAL no additional attributes |
| 86 | * are required. | ||
| 85 | * | 87 | * |
| 86 | * o LISTALL: | 88 | * o LISTALL: |
| 87 | * This message is sent by an application to list the valid DOIs on the | 89 | * This message is sent by an application to list the valid DOIs on the |