diff options
Diffstat (limited to 'test')
57 files changed, 16 insertions, 4 deletions
diff --git a/test/bsm/generate.c b/test/bsm/generate.c index 249e8858d034..bbc81bb8ca63 100644 --- a/test/bsm/generate.c +++ b/test/bsm/generate.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#14 $ */ /* @@ -792,6 +792,7 @@ generate_seq_record(const char *directory, const char *record_filename) write_record(directory, record_filename, seq_token, AUE_NULL); } +#if 0 /* * AUT_ACL */ @@ -823,7 +824,9 @@ generate_ipc_perm_record(const char *directory, const char *record_filename) token_t *ipc_perm_token; } +#endif +#if 0 /* * AUT_LABEL */ @@ -841,6 +844,7 @@ generate_groups_record(const char *directory, const char *record_filename) token_t *groups_token; } +#endif /* * AUT_ILABEL @@ -878,6 +882,7 @@ generate_groups_record(const char *directory, const char *record_filename) * AUT_EXEC_ENV */ +#if 0 static void generate_attr32_token(const char *directory, const char *token_filename) { @@ -891,6 +896,7 @@ generate_attr32_record(const char *directory, const char *record_filename) token_t *attr32_token; } +#endif static char *zonename_sample = "testzone"; @@ -916,7 +922,7 @@ generate_zonename_record(const char *directory, const char *record_filename) write_record(directory, record_filename, zonename_token, AUE_NULL); } -static u_short socketex_domain = AF_INET; +static u_short socketex_domain = PF_INET; static u_short socketex_type = SOCK_STREAM; static struct sockaddr_in socketex_laddr, socketex_raddr; @@ -935,7 +941,8 @@ generate_socketex_token(const char *directory, const char *token_filename) socketex_raddr.sin_len = sizeof(socketex_raddr); socketex_raddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - socketex_token = au_to_socket_ex(socketex_domain, socketex_type, + socketex_token = au_to_socket_ex(au_domain_to_bsm(socketex_domain), + au_socket_type_to_bsm(socketex_type), (struct sockaddr *)&socketex_laddr, (struct sockaddr *)&socketex_raddr); if (socketex_token == NULL) @@ -958,7 +965,8 @@ generate_socketex_record(const char *directory, const char *record_filename) socketex_raddr.sin_len = sizeof(socketex_raddr); socketex_raddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - socketex_token = au_to_socket_ex(socketex_domain, socketex_type, + socketex_token = au_to_socket_ex(au_domain_to_bsm(socketex_domain), + au_socket_type_to_bsm(socketex_type), (struct sockaddr *)&socketex_laddr, (struct sockaddr *)&socketex_raddr); if (socketex_token == NULL) @@ -1096,10 +1104,12 @@ main(int argc, char *argv[]) generate_iport_token(directory, "iport_token"); generate_arg32_token(directory, "arg32_token"); generate_seq_token(directory, "seq_token"); +#if 0 generate_attr_token(directory, "attr_token"); generate_ipc_perm_token(directory, "ipc_perm_token"); generate_groups_token(directory, "groups_token"); generate_attr32_token(directory, "attr32_token"); +#endif generate_zonename_token(directory, "zonename_token"); generate_socketex_token(directory, "socketex_token"); } @@ -1132,10 +1142,12 @@ main(int argc, char *argv[]) generate_iport_record(directory, "iport_record"); generate_arg32_record(directory, "arg32_record"); generate_seq_record(directory, "seq_record"); +#if 0 generate_attr_record(directory, "attr_record"); generate_ipc_perm_record(directory, "ipc_perm_record"); generate_groups_record(directory, "groups_record"); generate_attr32_record(directory, "attr32_record"); +#endif generate_zonename_record(directory, "zonename_record"); generate_socketex_record(directory, "socketex_record"); do_error_records(directory); diff --git a/test/reference/E2BIG_record b/test/reference/E2BIG_record Binary files differindex d95b8559abdf..86659006b0f3 100644 --- a/test/reference/E2BIG_record +++ b/test/reference/E2BIG_record diff --git a/test/reference/EACCES_record b/test/reference/EACCES_record Binary files differindex 6eecd6edaecc..7ab3181c960a 100644 --- a/test/reference/EACCES_record +++ b/test/reference/EACCES_record diff --git a/test/reference/EBADF_record b/test/reference/EBADF_record Binary files differindex d169ad2b55c1..ed80d6a9890f 100644 --- a/test/reference/EBADF_record +++ b/test/reference/EBADF_record diff --git a/test/reference/EBUSY_record b/test/reference/EBUSY_record Binary files differindex 6d3e89607729..1ceaf626a443 100644 --- a/test/reference/EBUSY_record +++ b/test/reference/EBUSY_record diff --git a/test/reference/ECHILD_record b/test/reference/ECHILD_record Binary files differindex 3beca2a8244b..fc1e88407a00 100644 --- a/test/reference/ECHILD_record +++ b/test/reference/ECHILD_record diff --git a/test/reference/EDEADLK_record b/test/reference/EDEADLK_record Binary files differindex 9d6a25b27739..ace3c462497e 100644 --- a/test/reference/EDEADLK_record +++ b/test/reference/EDEADLK_record diff --git a/test/reference/EEXIST_record b/test/reference/EEXIST_record Binary files differindex 04dbf35bbc84..f6eae9f4fc57 100644 --- a/test/reference/EEXIST_record +++ b/test/reference/EEXIST_record diff --git a/test/reference/EFAULT_record b/test/reference/EFAULT_record Binary files differindex 1ed507832045..1b8ed093c54b 100644 --- a/test/reference/EFAULT_record +++ b/test/reference/EFAULT_record diff --git a/test/reference/EFBIG_record b/test/reference/EFBIG_record Binary files differindex d0716ff9eaf3..fc4a060397b5 100644 --- a/test/reference/EFBIG_record +++ b/test/reference/EFBIG_record diff --git a/test/reference/EINTR_record b/test/reference/EINTR_record Binary files differindex ab9da8ee1566..2c96d4a3eab7 100644 --- a/test/reference/EINTR_record +++ b/test/reference/EINTR_record diff --git a/test/reference/EINVAL_record b/test/reference/EINVAL_record Binary files differindex a658c62915d0..0068cd1ddfdb 100644 --- a/test/reference/EINVAL_record +++ b/test/reference/EINVAL_record diff --git a/test/reference/EIO_record b/test/reference/EIO_record Binary files differindex 6752b71ad893..36682c360cf5 100644 --- a/test/reference/EIO_record +++ b/test/reference/EIO_record diff --git a/test/reference/EISDIR_record b/test/reference/EISDIR_record Binary files differindex 8cec4e10fbcb..56ccdf3a38be 100644 --- a/test/reference/EISDIR_record +++ b/test/reference/EISDIR_record diff --git a/test/reference/EMFILE_record b/test/reference/EMFILE_record Binary files differindex 8bc30d829541..b15e0e5c8c2b 100644 --- a/test/reference/EMFILE_record +++ b/test/reference/EMFILE_record diff --git a/test/reference/EMLINK_record b/test/reference/EMLINK_record Binary files differindex a84cf482a47d..27c048c73f1a 100644 --- a/test/reference/EMLINK_record +++ b/test/reference/EMLINK_record diff --git a/test/reference/ENFILE_record b/test/reference/ENFILE_record Binary files differindex 5dc5f597bd4d..7dbbb3dcbf14 100644 --- a/test/reference/ENFILE_record +++ b/test/reference/ENFILE_record diff --git a/test/reference/ENODEV_record b/test/reference/ENODEV_record Binary files differindex c2e642b52fd4..1e745d830ed4 100644 --- a/test/reference/ENODEV_record +++ b/test/reference/ENODEV_record diff --git a/test/reference/ENOENT_record b/test/reference/ENOENT_record Binary files differindex 10d855ad54cc..33395f80878e 100644 --- a/test/reference/ENOENT_record +++ b/test/reference/ENOENT_record diff --git a/test/reference/ENOEXEC_record b/test/reference/ENOEXEC_record Binary files differindex 180ee3aae2c1..a2e25930a111 100644 --- a/test/reference/ENOEXEC_record +++ b/test/reference/ENOEXEC_record diff --git a/test/reference/ENOMEM_record b/test/reference/ENOMEM_record Binary files differindex cc7f1c159241..f7137e748cac 100644 --- a/test/reference/ENOMEM_record +++ b/test/reference/ENOMEM_record diff --git a/test/reference/ENOSPC_record b/test/reference/ENOSPC_record Binary files differindex a2795ce574dc..863a9a71c847 100644 --- a/test/reference/ENOSPC_record +++ b/test/reference/ENOSPC_record diff --git a/test/reference/ENOTBLK_record b/test/reference/ENOTBLK_record Binary files differindex b2021628f1bd..6b14cb128772 100644 --- a/test/reference/ENOTBLK_record +++ b/test/reference/ENOTBLK_record diff --git a/test/reference/ENOTDIR_record b/test/reference/ENOTDIR_record Binary files differindex 33f7427a4973..9b311c0d8be4 100644 --- a/test/reference/ENOTDIR_record +++ b/test/reference/ENOTDIR_record diff --git a/test/reference/ENOTTY_record b/test/reference/ENOTTY_record Binary files differindex c9c8f36165f3..31e98ee8c17b 100644 --- a/test/reference/ENOTTY_record +++ b/test/reference/ENOTTY_record diff --git a/test/reference/ENXIO_record b/test/reference/ENXIO_record Binary files differindex 83894dba3cde..72bb902eb862 100644 --- a/test/reference/ENXIO_record +++ b/test/reference/ENXIO_record diff --git a/test/reference/EPERM_record b/test/reference/EPERM_record Binary files differindex 41f20ba540b1..b0822e689462 100644 --- a/test/reference/EPERM_record +++ b/test/reference/EPERM_record diff --git a/test/reference/EPIPE_record b/test/reference/EPIPE_record Binary files differindex 795c9f716cd2..c85fa400b52f 100644 --- a/test/reference/EPIPE_record +++ b/test/reference/EPIPE_record diff --git a/test/reference/EROFS_record b/test/reference/EROFS_record Binary files differindex bd0a91baac9e..79468eca853a 100644 --- a/test/reference/EROFS_record +++ b/test/reference/EROFS_record diff --git a/test/reference/ESPIPE_record b/test/reference/ESPIPE_record Binary files differindex 7c1bed3613f5..196390f9fef6 100644 --- a/test/reference/ESPIPE_record +++ b/test/reference/ESPIPE_record diff --git a/test/reference/ESRCH_record b/test/reference/ESRCH_record Binary files differindex 43a04e12931d..1d55e176b2c2 100644 --- a/test/reference/ESRCH_record +++ b/test/reference/ESRCH_record diff --git a/test/reference/ETXTBSY_record b/test/reference/ETXTBSY_record Binary files differindex b69309f1379b..2a8895d93bc4 100644 --- a/test/reference/ETXTBSY_record +++ b/test/reference/ETXTBSY_record diff --git a/test/reference/EXDEV_record b/test/reference/EXDEV_record Binary files differindex c60cc26d7696..ca4a620d1d38 100644 --- a/test/reference/EXDEV_record +++ b/test/reference/EXDEV_record diff --git a/test/reference/arg32_record b/test/reference/arg32_record Binary files differindex cb2379aa0430..12a545df4f2a 100644 --- a/test/reference/arg32_record +++ b/test/reference/arg32_record diff --git a/test/reference/data_record b/test/reference/data_record Binary files differindex 7876b223ebd3..f23745912a8f 100644 --- a/test/reference/data_record +++ b/test/reference/data_record diff --git a/test/reference/data_token b/test/reference/data_token Binary files differindex e000b8a3a09d..835767679d60 100644 --- a/test/reference/data_token +++ b/test/reference/data_token diff --git a/test/reference/file_record b/test/reference/file_record Binary files differindex a80b8ed23337..b5d140638ecd 100644 --- a/test/reference/file_record +++ b/test/reference/file_record diff --git a/test/reference/in_addr_record b/test/reference/in_addr_record Binary files differindex 2b12d8064991..389b7435218d 100644 --- a/test/reference/in_addr_record +++ b/test/reference/in_addr_record diff --git a/test/reference/ip_record b/test/reference/ip_record Binary files differindex ebe66d91a5a8..5d8b21d84d03 100644 --- a/test/reference/ip_record +++ b/test/reference/ip_record diff --git a/test/reference/ipc_record b/test/reference/ipc_record Binary files differindex 9e7defc7d5a3..5b51561431f4 100644 --- a/test/reference/ipc_record +++ b/test/reference/ipc_record diff --git a/test/reference/iport_record b/test/reference/iport_record Binary files differindex 1f1adddc4cbd..bef1c9fb01e3 100644 --- a/test/reference/iport_record +++ b/test/reference/iport_record diff --git a/test/reference/opaque_record b/test/reference/opaque_record Binary files differindex c34ac5025538..e13a36bce596 100644 --- a/test/reference/opaque_record +++ b/test/reference/opaque_record diff --git a/test/reference/path_record b/test/reference/path_record Binary files differindex b809d7147553..fab532cb0aef 100644 --- a/test/reference/path_record +++ b/test/reference/path_record diff --git a/test/reference/process32_record b/test/reference/process32_record Binary files differindex 0fc103f6fff4..4f19d372c41b 100644 --- a/test/reference/process32_record +++ b/test/reference/process32_record diff --git a/test/reference/process32ex_record-IPv4 b/test/reference/process32ex_record-IPv4 Binary files differindex 7a1514c76fa7..4ff66c054d99 100644 --- a/test/reference/process32ex_record-IPv4 +++ b/test/reference/process32ex_record-IPv4 diff --git a/test/reference/process32ex_record-IPv6 b/test/reference/process32ex_record-IPv6 Binary files differindex 44183fcf8125..944510db38ec 100644 --- a/test/reference/process32ex_record-IPv6 +++ b/test/reference/process32ex_record-IPv6 diff --git a/test/reference/process64_record b/test/reference/process64_record Binary files differindex cf318bbbc827..5f831bfd6796 100644 --- a/test/reference/process64_record +++ b/test/reference/process64_record diff --git a/test/reference/process64ex_record-IPv4 b/test/reference/process64ex_record-IPv4 Binary files differindex 16969f8a3d3a..1440ac7a7be1 100644 --- a/test/reference/process64ex_record-IPv4 +++ b/test/reference/process64ex_record-IPv4 diff --git a/test/reference/process64ex_record-IPv6 b/test/reference/process64ex_record-IPv6 Binary files differindex bf8fc14e9ea2..da55f6a02a06 100644 --- a/test/reference/process64ex_record-IPv6 +++ b/test/reference/process64ex_record-IPv6 diff --git a/test/reference/return32_record b/test/reference/return32_record Binary files differindex f0b8610afa43..7919034884ce 100644 --- a/test/reference/return32_record +++ b/test/reference/return32_record diff --git a/test/reference/seq_record b/test/reference/seq_record Binary files differindex 34674b85e308..26c6180bd466 100644 --- a/test/reference/seq_record +++ b/test/reference/seq_record diff --git a/test/reference/socketex_record b/test/reference/socketex_record Binary files differindex b41c5f9471cd..522fb5172f29 100644 --- a/test/reference/socketex_record +++ b/test/reference/socketex_record diff --git a/test/reference/socketex_token b/test/reference/socketex_token Binary files differindex 47a9e199a451..d1072905af6a 100644 --- a/test/reference/socketex_token +++ b/test/reference/socketex_token diff --git a/test/reference/subject32_record b/test/reference/subject32_record Binary files differindex a806651cf71e..ed91cf0f6f3b 100644 --- a/test/reference/subject32_record +++ b/test/reference/subject32_record diff --git a/test/reference/subject32ex_record b/test/reference/subject32ex_record Binary files differindex 1debf62609e5..5b5575e4e5b8 100644 --- a/test/reference/subject32ex_record +++ b/test/reference/subject32ex_record diff --git a/test/reference/text_record b/test/reference/text_record Binary files differindex b7d25db2301e..694dc5c3dea7 100644 --- a/test/reference/text_record +++ b/test/reference/text_record diff --git a/test/reference/zonename_record b/test/reference/zonename_record Binary files differindex 618285933cae..1fa8d97d3335 100644 --- a/test/reference/zonename_record +++ b/test/reference/zonename_record |