diff options
Diffstat (limited to 'contrib/openbsm/test')
57 files changed, 16 insertions, 4 deletions
diff --git a/contrib/openbsm/test/bsm/generate.c b/contrib/openbsm/test/bsm/generate.c index 249e885..bbc81bb 100644 --- a/contrib/openbsm/test/bsm/generate.c +++ b/contrib/openbsm/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/contrib/openbsm/test/reference/E2BIG_record b/contrib/openbsm/test/reference/E2BIG_record Binary files differindex d95b855..8665900 100644 --- a/contrib/openbsm/test/reference/E2BIG_record +++ b/contrib/openbsm/test/reference/E2BIG_record diff --git a/contrib/openbsm/test/reference/EACCES_record b/contrib/openbsm/test/reference/EACCES_record Binary files differindex 6eecd6e..7ab3181 100644 --- a/contrib/openbsm/test/reference/EACCES_record +++ b/contrib/openbsm/test/reference/EACCES_record diff --git a/contrib/openbsm/test/reference/EBADF_record b/contrib/openbsm/test/reference/EBADF_record Binary files differindex d169ad2..ed80d6a 100644 --- a/contrib/openbsm/test/reference/EBADF_record +++ b/contrib/openbsm/test/reference/EBADF_record diff --git a/contrib/openbsm/test/reference/EBUSY_record b/contrib/openbsm/test/reference/EBUSY_record Binary files differindex 6d3e896..1ceaf62 100644 --- a/contrib/openbsm/test/reference/EBUSY_record +++ b/contrib/openbsm/test/reference/EBUSY_record diff --git a/contrib/openbsm/test/reference/ECHILD_record b/contrib/openbsm/test/reference/ECHILD_record Binary files differindex 3beca2a..fc1e884 100644 --- a/contrib/openbsm/test/reference/ECHILD_record +++ b/contrib/openbsm/test/reference/ECHILD_record diff --git a/contrib/openbsm/test/reference/EDEADLK_record b/contrib/openbsm/test/reference/EDEADLK_record Binary files differindex 9d6a25b..ace3c46 100644 --- a/contrib/openbsm/test/reference/EDEADLK_record +++ b/contrib/openbsm/test/reference/EDEADLK_record diff --git a/contrib/openbsm/test/reference/EEXIST_record b/contrib/openbsm/test/reference/EEXIST_record Binary files differindex 04dbf35..f6eae9f 100644 --- a/contrib/openbsm/test/reference/EEXIST_record +++ b/contrib/openbsm/test/reference/EEXIST_record diff --git a/contrib/openbsm/test/reference/EFAULT_record b/contrib/openbsm/test/reference/EFAULT_record Binary files differindex 1ed5078..1b8ed09 100644 --- a/contrib/openbsm/test/reference/EFAULT_record +++ b/contrib/openbsm/test/reference/EFAULT_record diff --git a/contrib/openbsm/test/reference/EFBIG_record b/contrib/openbsm/test/reference/EFBIG_record Binary files differindex d0716ff..fc4a060 100644 --- a/contrib/openbsm/test/reference/EFBIG_record +++ b/contrib/openbsm/test/reference/EFBIG_record diff --git a/contrib/openbsm/test/reference/EINTR_record b/contrib/openbsm/test/reference/EINTR_record Binary files differindex ab9da8e..2c96d4a 100644 --- a/contrib/openbsm/test/reference/EINTR_record +++ b/contrib/openbsm/test/reference/EINTR_record diff --git a/contrib/openbsm/test/reference/EINVAL_record b/contrib/openbsm/test/reference/EINVAL_record Binary files differindex a658c62..0068cd1 100644 --- a/contrib/openbsm/test/reference/EINVAL_record +++ b/contrib/openbsm/test/reference/EINVAL_record diff --git a/contrib/openbsm/test/reference/EIO_record b/contrib/openbsm/test/reference/EIO_record Binary files differindex 6752b71..36682c3 100644 --- a/contrib/openbsm/test/reference/EIO_record +++ b/contrib/openbsm/test/reference/EIO_record diff --git a/contrib/openbsm/test/reference/EISDIR_record b/contrib/openbsm/test/reference/EISDIR_record Binary files differindex 8cec4e1..56ccdf3 100644 --- a/contrib/openbsm/test/reference/EISDIR_record +++ b/contrib/openbsm/test/reference/EISDIR_record diff --git a/contrib/openbsm/test/reference/EMFILE_record b/contrib/openbsm/test/reference/EMFILE_record Binary files differindex 8bc30d8..b15e0e5 100644 --- a/contrib/openbsm/test/reference/EMFILE_record +++ b/contrib/openbsm/test/reference/EMFILE_record diff --git a/contrib/openbsm/test/reference/EMLINK_record b/contrib/openbsm/test/reference/EMLINK_record Binary files differindex a84cf48..27c048c 100644 --- a/contrib/openbsm/test/reference/EMLINK_record +++ b/contrib/openbsm/test/reference/EMLINK_record diff --git a/contrib/openbsm/test/reference/ENFILE_record b/contrib/openbsm/test/reference/ENFILE_record Binary files differindex 5dc5f59..7dbbb3d 100644 --- a/contrib/openbsm/test/reference/ENFILE_record +++ b/contrib/openbsm/test/reference/ENFILE_record diff --git a/contrib/openbsm/test/reference/ENODEV_record b/contrib/openbsm/test/reference/ENODEV_record Binary files differindex c2e642b..1e745d8 100644 --- a/contrib/openbsm/test/reference/ENODEV_record +++ b/contrib/openbsm/test/reference/ENODEV_record diff --git a/contrib/openbsm/test/reference/ENOENT_record b/contrib/openbsm/test/reference/ENOENT_record Binary files differindex 10d855a..33395f8 100644 --- a/contrib/openbsm/test/reference/ENOENT_record +++ b/contrib/openbsm/test/reference/ENOENT_record diff --git a/contrib/openbsm/test/reference/ENOEXEC_record b/contrib/openbsm/test/reference/ENOEXEC_record Binary files differindex 180ee3a..a2e2593 100644 --- a/contrib/openbsm/test/reference/ENOEXEC_record +++ b/contrib/openbsm/test/reference/ENOEXEC_record diff --git a/contrib/openbsm/test/reference/ENOMEM_record b/contrib/openbsm/test/reference/ENOMEM_record Binary files differindex cc7f1c1..f7137e7 100644 --- a/contrib/openbsm/test/reference/ENOMEM_record +++ b/contrib/openbsm/test/reference/ENOMEM_record diff --git a/contrib/openbsm/test/reference/ENOSPC_record b/contrib/openbsm/test/reference/ENOSPC_record Binary files differindex a2795ce..863a9a7 100644 --- a/contrib/openbsm/test/reference/ENOSPC_record +++ b/contrib/openbsm/test/reference/ENOSPC_record diff --git a/contrib/openbsm/test/reference/ENOTBLK_record b/contrib/openbsm/test/reference/ENOTBLK_record Binary files differindex b202162..6b14cb1 100644 --- a/contrib/openbsm/test/reference/ENOTBLK_record +++ b/contrib/openbsm/test/reference/ENOTBLK_record diff --git a/contrib/openbsm/test/reference/ENOTDIR_record b/contrib/openbsm/test/reference/ENOTDIR_record Binary files differindex 33f7427..9b311c0 100644 --- a/contrib/openbsm/test/reference/ENOTDIR_record +++ b/contrib/openbsm/test/reference/ENOTDIR_record diff --git a/contrib/openbsm/test/reference/ENOTTY_record b/contrib/openbsm/test/reference/ENOTTY_record Binary files differindex c9c8f36..31e98ee 100644 --- a/contrib/openbsm/test/reference/ENOTTY_record +++ b/contrib/openbsm/test/reference/ENOTTY_record diff --git a/contrib/openbsm/test/reference/ENXIO_record b/contrib/openbsm/test/reference/ENXIO_record Binary files differindex 83894db..72bb902 100644 --- a/contrib/openbsm/test/reference/ENXIO_record +++ b/contrib/openbsm/test/reference/ENXIO_record diff --git a/contrib/openbsm/test/reference/EPERM_record b/contrib/openbsm/test/reference/EPERM_record Binary files differindex 41f20ba..b0822e6 100644 --- a/contrib/openbsm/test/reference/EPERM_record +++ b/contrib/openbsm/test/reference/EPERM_record diff --git a/contrib/openbsm/test/reference/EPIPE_record b/contrib/openbsm/test/reference/EPIPE_record Binary files differindex 795c9f7..c85fa40 100644 --- a/contrib/openbsm/test/reference/EPIPE_record +++ b/contrib/openbsm/test/reference/EPIPE_record diff --git a/contrib/openbsm/test/reference/EROFS_record b/contrib/openbsm/test/reference/EROFS_record Binary files differindex bd0a91b..79468ec 100644 --- a/contrib/openbsm/test/reference/EROFS_record +++ b/contrib/openbsm/test/reference/EROFS_record diff --git a/contrib/openbsm/test/reference/ESPIPE_record b/contrib/openbsm/test/reference/ESPIPE_record Binary files differindex 7c1bed3..196390f 100644 --- a/contrib/openbsm/test/reference/ESPIPE_record +++ b/contrib/openbsm/test/reference/ESPIPE_record diff --git a/contrib/openbsm/test/reference/ESRCH_record b/contrib/openbsm/test/reference/ESRCH_record Binary files differindex 43a04e1..1d55e17 100644 --- a/contrib/openbsm/test/reference/ESRCH_record +++ b/contrib/openbsm/test/reference/ESRCH_record diff --git a/contrib/openbsm/test/reference/ETXTBSY_record b/contrib/openbsm/test/reference/ETXTBSY_record Binary files differindex b69309f..2a8895d 100644 --- a/contrib/openbsm/test/reference/ETXTBSY_record +++ b/contrib/openbsm/test/reference/ETXTBSY_record diff --git a/contrib/openbsm/test/reference/EXDEV_record b/contrib/openbsm/test/reference/EXDEV_record Binary files differindex c60cc26..ca4a620 100644 --- a/contrib/openbsm/test/reference/EXDEV_record +++ b/contrib/openbsm/test/reference/EXDEV_record diff --git a/contrib/openbsm/test/reference/arg32_record b/contrib/openbsm/test/reference/arg32_record Binary files differindex cb2379aa..12a545d 100644 --- a/contrib/openbsm/test/reference/arg32_record +++ b/contrib/openbsm/test/reference/arg32_record diff --git a/contrib/openbsm/test/reference/data_record b/contrib/openbsm/test/reference/data_record Binary files differindex 7876b22..f237459 100644 --- a/contrib/openbsm/test/reference/data_record +++ b/contrib/openbsm/test/reference/data_record diff --git a/contrib/openbsm/test/reference/data_token b/contrib/openbsm/test/reference/data_token Binary files differindex e000b8a..83576767 100644 --- a/contrib/openbsm/test/reference/data_token +++ b/contrib/openbsm/test/reference/data_token diff --git a/contrib/openbsm/test/reference/file_record b/contrib/openbsm/test/reference/file_record Binary files differindex a80b8ed2..b5d1406 100644 --- a/contrib/openbsm/test/reference/file_record +++ b/contrib/openbsm/test/reference/file_record diff --git a/contrib/openbsm/test/reference/in_addr_record b/contrib/openbsm/test/reference/in_addr_record Binary files differindex 2b12d80..389b743 100644 --- a/contrib/openbsm/test/reference/in_addr_record +++ b/contrib/openbsm/test/reference/in_addr_record diff --git a/contrib/openbsm/test/reference/ip_record b/contrib/openbsm/test/reference/ip_record Binary files differindex ebe66d9..5d8b21d 100644 --- a/contrib/openbsm/test/reference/ip_record +++ b/contrib/openbsm/test/reference/ip_record diff --git a/contrib/openbsm/test/reference/ipc_record b/contrib/openbsm/test/reference/ipc_record Binary files differindex 9e7defc..5b51561 100644 --- a/contrib/openbsm/test/reference/ipc_record +++ b/contrib/openbsm/test/reference/ipc_record diff --git a/contrib/openbsm/test/reference/iport_record b/contrib/openbsm/test/reference/iport_record Binary files differindex 1f1addd..bef1c9f 100644 --- a/contrib/openbsm/test/reference/iport_record +++ b/contrib/openbsm/test/reference/iport_record diff --git a/contrib/openbsm/test/reference/opaque_record b/contrib/openbsm/test/reference/opaque_record Binary files differindex c34ac50..e13a36b 100644 --- a/contrib/openbsm/test/reference/opaque_record +++ b/contrib/openbsm/test/reference/opaque_record diff --git a/contrib/openbsm/test/reference/path_record b/contrib/openbsm/test/reference/path_record Binary files differindex b809d71..fab532c 100644 --- a/contrib/openbsm/test/reference/path_record +++ b/contrib/openbsm/test/reference/path_record diff --git a/contrib/openbsm/test/reference/process32_record b/contrib/openbsm/test/reference/process32_record Binary files differindex 0fc103f..4f19d37 100644 --- a/contrib/openbsm/test/reference/process32_record +++ b/contrib/openbsm/test/reference/process32_record diff --git a/contrib/openbsm/test/reference/process32ex_record-IPv4 b/contrib/openbsm/test/reference/process32ex_record-IPv4 Binary files differindex 7a1514c..4ff66c0 100644 --- a/contrib/openbsm/test/reference/process32ex_record-IPv4 +++ b/contrib/openbsm/test/reference/process32ex_record-IPv4 diff --git a/contrib/openbsm/test/reference/process32ex_record-IPv6 b/contrib/openbsm/test/reference/process32ex_record-IPv6 Binary files differindex 44183fc..944510d 100644 --- a/contrib/openbsm/test/reference/process32ex_record-IPv6 +++ b/contrib/openbsm/test/reference/process32ex_record-IPv6 diff --git a/contrib/openbsm/test/reference/process64_record b/contrib/openbsm/test/reference/process64_record Binary files differindex cf318bb..5f831bf 100644 --- a/contrib/openbsm/test/reference/process64_record +++ b/contrib/openbsm/test/reference/process64_record diff --git a/contrib/openbsm/test/reference/process64ex_record-IPv4 b/contrib/openbsm/test/reference/process64ex_record-IPv4 Binary files differindex 16969f8..1440ac7 100644 --- a/contrib/openbsm/test/reference/process64ex_record-IPv4 +++ b/contrib/openbsm/test/reference/process64ex_record-IPv4 diff --git a/contrib/openbsm/test/reference/process64ex_record-IPv6 b/contrib/openbsm/test/reference/process64ex_record-IPv6 Binary files differindex bf8fc14..da55f6a 100644 --- a/contrib/openbsm/test/reference/process64ex_record-IPv6 +++ b/contrib/openbsm/test/reference/process64ex_record-IPv6 diff --git a/contrib/openbsm/test/reference/return32_record b/contrib/openbsm/test/reference/return32_record Binary files differindex f0b8610..7919034 100644 --- a/contrib/openbsm/test/reference/return32_record +++ b/contrib/openbsm/test/reference/return32_record diff --git a/contrib/openbsm/test/reference/seq_record b/contrib/openbsm/test/reference/seq_record Binary files differindex 34674b8..26c6180 100644 --- a/contrib/openbsm/test/reference/seq_record +++ b/contrib/openbsm/test/reference/seq_record diff --git a/contrib/openbsm/test/reference/socketex_record b/contrib/openbsm/test/reference/socketex_record Binary files differindex b41c5f9..522fb51 100644 --- a/contrib/openbsm/test/reference/socketex_record +++ b/contrib/openbsm/test/reference/socketex_record diff --git a/contrib/openbsm/test/reference/socketex_token b/contrib/openbsm/test/reference/socketex_token Binary files differindex 47a9e19..d107290 100644 --- a/contrib/openbsm/test/reference/socketex_token +++ b/contrib/openbsm/test/reference/socketex_token diff --git a/contrib/openbsm/test/reference/subject32_record b/contrib/openbsm/test/reference/subject32_record Binary files differindex a806651..ed91cf0 100644 --- a/contrib/openbsm/test/reference/subject32_record +++ b/contrib/openbsm/test/reference/subject32_record diff --git a/contrib/openbsm/test/reference/subject32ex_record b/contrib/openbsm/test/reference/subject32ex_record Binary files differindex 1debf62..5b5575e 100644 --- a/contrib/openbsm/test/reference/subject32ex_record +++ b/contrib/openbsm/test/reference/subject32ex_record diff --git a/contrib/openbsm/test/reference/text_record b/contrib/openbsm/test/reference/text_record Binary files differindex b7d25db..694dc5c 100644 --- a/contrib/openbsm/test/reference/text_record +++ b/contrib/openbsm/test/reference/text_record diff --git a/contrib/openbsm/test/reference/zonename_record b/contrib/openbsm/test/reference/zonename_record Binary files differindex 6182859..1fa8d97 100644 --- a/contrib/openbsm/test/reference/zonename_record +++ b/contrib/openbsm/test/reference/zonename_record |
