diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2008-08-02 22:30:51 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2008-08-02 22:30:51 +0000 |
| commit | 95b85ca3a92db2057a56eed2f757aea0b0fad2da (patch) | |
| tree | 7fc947d236a22b5b21df83a171d26ab2454a31b5 /sys/security/mac_mls | |
| parent | f7c4bd95ba735bd6a5454b4953945a99cefbb80c (diff) | |
Notes
Diffstat (limited to 'sys/security/mac_mls')
| -rw-r--r-- | sys/security/mac_mls/mac_mls.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 34c618ce981d..c3b2cdaa6bd0 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -399,14 +399,12 @@ mls_set_range(struct mac_mls *mm, u_short typelow, u_short levellow, mm->mm_rangelow.mme_type = typelow; mm->mm_rangelow.mme_level = levellow; if (compartmentslow != NULL) - memcpy(mm->mm_rangelow.mme_compartments, - compartmentslow, + memcpy(mm->mm_rangelow.mme_compartments, compartmentslow, sizeof(mm->mm_rangelow.mme_compartments)); mm->mm_rangehigh.mme_type = typehigh; mm->mm_rangehigh.mme_level = levelhigh; if (compartmentshigh != NULL) - memcpy(mm->mm_rangehigh.mme_compartments, - compartmentshigh, + memcpy(mm->mm_rangehigh.mme_compartments, compartmentshigh, sizeof(mm->mm_rangehigh.mme_compartments)); mm->mm_flags |= MAC_MLS_FLAG_RANGE; } @@ -689,12 +687,10 @@ mls_parse(struct mac_mls *mm, char *string) } if (rangelow != NULL) { - error = mls_parse_element(&mm->mm_rangelow, - rangelow); + error = mls_parse_element(&mm->mm_rangelow, rangelow); if (error) return (error); - error = mls_parse_element(&mm->mm_rangehigh, - rangehigh); + error = mls_parse_element(&mm->mm_rangehigh, rangehigh); if (error) return (error); mm->mm_flags |= MAC_MLS_FLAG_RANGE; @@ -736,7 +732,6 @@ mls_copy_label(struct label *src, struct label *dest) *SLOT(dest) = *SLOT(src); } - /* * Object-specific entry point implementations are sorted alphabetically by * object type name and then by operation. |