diff options
| -rw-r--r-- | deleted_files/usr/src/cmd/allocate/mkdevmaps.c (renamed from usr/src/cmd/allocate/mkdevmaps.c) | 0 | ||||
| -rw-r--r-- | deleted_files/usr/src/lib/libtsnet/common/tsol_getzcent.c (renamed from usr/src/lib/libtsnet/common/tsol_getzcent.c) | 0 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/lp/cmd/adaptor/misc.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/lp/lib/papi/service.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libtsnet/common/tsol_sgettpent.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libtsnet/spec/versions | 6 | ||||
| -rw-r--r-- | usr/src/lib/libtsol/common/stol.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/tsol/label.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/tsol/label_macro.h | 5 |
10 files changed, 15 insertions, 12 deletions
diff --git a/usr/src/cmd/allocate/mkdevmaps.c b/deleted_files/usr/src/cmd/allocate/mkdevmaps.c index f4167ebf2c..f4167ebf2c 100644 --- a/usr/src/cmd/allocate/mkdevmaps.c +++ b/deleted_files/usr/src/cmd/allocate/mkdevmaps.c diff --git a/usr/src/lib/libtsnet/common/tsol_getzcent.c b/deleted_files/usr/src/lib/libtsnet/common/tsol_getzcent.c index 4faf1cf5be..4faf1cf5be 100644 --- a/usr/src/lib/libtsnet/common/tsol_getzcent.c +++ b/deleted_files/usr/src/lib/libtsnet/common/tsol_getzcent.c diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c index be6440a525..4eaa51817e 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_ip.c @@ -1335,7 +1335,7 @@ interpret_cipso_tagtype1(const uchar_t *opt) "Categories = None"); } cipso2sl(opt, &sl, &ishigh); - if (is_system_labeled) { + if (is_system_labeled()) { if (bsltos(&sl, &plabel, ALABEL_MAXLEN, LONG_CLASSIFICATION|LONG_WORDS|VIEW_INTERNAL) < 0) { (void) snprintf(get_line(0, 0), get_line_remain(), diff --git a/usr/src/cmd/lp/cmd/adaptor/misc.c b/usr/src/cmd/lp/cmd/adaptor/misc.c index e4959df8fa..4aeb08b4df 100644 --- a/usr/src/cmd/lp/cmd/adaptor/misc.c +++ b/usr/src/cmd/lp/cmd/adaptor/misc.c @@ -228,7 +228,7 @@ lpsched_client_access(const char *printer, const char *host, int peerfd) if ((printer == NULL) || (host == NULL)) return (-1); - if (is_system_labeled) { + if (is_system_labeled()) { short status = MOK; extern MESG *lp_Md; /* liblpmsg supplies this */ diff --git a/usr/src/cmd/lp/lib/papi/service.c b/usr/src/cmd/lp/lib/papi/service.c index d4512636f4..f9c9162406 100644 --- a/usr/src/cmd/lp/lib/papi/service.c +++ b/usr/src/cmd/lp/lib/papi/service.c @@ -105,7 +105,7 @@ papiServiceSetPeer(papi_service_t handle, int peerfd) if (svc == NULL) return (PAPI_BAD_ARGUMENT); - if (is_system_labeled) { + if (is_system_labeled()) { short status; if ((snd_msg(svc, S_PASS_PEER_CONNECTION) < 0) || diff --git a/usr/src/lib/libtsnet/common/tsol_sgettpent.c b/usr/src/lib/libtsnet/common/tsol_sgettpent.c index 37fd75b234..295fdba190 100644 --- a/usr/src/lib/libtsnet/common/tsol_sgettpent.c +++ b/usr/src/lib/libtsnet/common/tsol_sgettpent.c @@ -45,6 +45,7 @@ #include <strings.h> #include <libtsnet.h> #include <tsol/label.h> +#include <sys/tsol/label_macro.h> #include <sys/types.h> #include <nss.h> #include <secdb.h> diff --git a/usr/src/lib/libtsnet/spec/versions b/usr/src/lib/libtsnet/spec/versions index 43c70977f7..36bb621276 100644 --- a/usr/src/lib/libtsnet/spec/versions +++ b/usr/src/lib/libtsnet/spec/versions @@ -33,3 +33,9 @@ sparc { i386 { SUNWprivate_1.1; } +sparcv9 { + SUNWprivate_1.1; +} +amd64 { + SUNWprivate_1.1; +} diff --git a/usr/src/lib/libtsol/common/stol.c b/usr/src/lib/libtsol/common/stol.c index 2a951b3907..5dcd2147b1 100644 --- a/usr/src/lib/libtsol/common/stol.c +++ b/usr/src/lib/libtsol/common/stol.c @@ -103,10 +103,6 @@ htol(char *s, m_label_t *l) goto error; } lp = (uchar_t *)&(((_mac_label_impl_t *)l)->_comps); - if (LCLASS(l) < LOW_CLASS || - LCLASS(l) > HIGH_CLASS) { - goto error; - } if (h[0] == '-' && h[3] == '-') { uchar_t size; diff --git a/usr/src/uts/common/sys/tsol/label.h b/usr/src/uts/common/sys/tsol/label.h index 0eec1b497d..98ddcac6f8 100644 --- a/usr/src/uts/common/sys/tsol/label.h +++ b/usr/src/uts/common/sys/tsol/label.h @@ -54,11 +54,6 @@ typedef struct _tsol_binary_level_lrange { /* Level Range */ typedef m_range_t blrange_t; -#define NMLP_MAX 0x10 -#define NSLS_MAX 0x4 - -typedef m_label_t blset_t[NSLS_MAX]; - typedef struct tsol_mlp_s { uchar_t mlp_ipp; uint16_t mlp_port; diff --git a/usr/src/uts/common/sys/tsol/label_macro.h b/usr/src/uts/common/sys/tsol/label_macro.h index 43cf328e7d..7fd1d22bdb 100644 --- a/usr/src/uts/common/sys/tsol/label_macro.h +++ b/usr/src/uts/common/sys/tsol/label_macro.h @@ -94,6 +94,11 @@ typedef struct _binary_level_range_impl { /* Level Range */ _mac_label_impl_t upper_bound; } _brange_impl_t, brange_t; +#define NMLP_MAX 0x10 +#define NSLS_MAX 0x4 + +typedef _mac_label_impl_t blset_t[NSLS_MAX]; + /* Label Identifier Types */ #define SUN_MAC_ID 0x41 /* MAC label, legacy SUN_SL_ID */ |