diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION --exclude Makefile old/libselinux/src/seusers.c new/libselinux/src/seusers.c --- old/libselinux/src/seusers.c 2005-11-04 10:13:47.000000000 -0500 +++ new/libselinux/src/seusers.c 2005-11-04 13:05:10.000000000 -0500 @@ -45,7 +45,6 @@ static int process_seusers(const char *b if (!end) { mls_found = 0; - /* MLS is disabled, so :level suffix not required. */ end = start; while (*end && !isspace(*end)) end++; @@ -55,9 +54,10 @@ static int process_seusers(const char *b seuser = strdup(start); if (!seuser) goto err; - + + /* Skip MLS if disabled, or missing. */ if (!mls_enabled || !mls_found) - goto out; /* skip any MLS level */ + goto out; start = ++end; while (*end && !isspace(*end)) diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION --exclude Makefile old/libsemanage/src/booleans_file.c new/libsemanage/src/booleans_file.c --- old/libsemanage/src/booleans_file.c 2005-11-04 03:03:26.000000000 -0500 +++ new/libsemanage/src/booleans_file.c 2005-11-04 13:14:51.000000000 -0500 @@ -87,6 +87,9 @@ static int bool_parse( } semanage_bool_set_value(boolean, value); + if (parse_assert_space(handle, info) < 0) + goto err; + return STATUS_SUCCESS; last: diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION --exclude Makefile old/libsemanage/src/interfaces_file.c new/libsemanage/src/interfaces_file.c --- old/libsemanage/src/interfaces_file.c 2005-11-04 03:03:26.000000000 -0500 +++ new/libsemanage/src/interfaces_file.c 2005-11-04 13:22:57.000000000 -0500 @@ -127,6 +127,9 @@ static int iface_parse( semanage_iface_set_msgcon(iface, con); con = NULL; + if (parse_assert_space(handle, info) < 0) + goto err; + return STATUS_SUCCESS; last: diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION --exclude Makefile old/libsemanage/src/ports_file.c new/libsemanage/src/ports_file.c --- old/libsemanage/src/ports_file.c 2005-11-04 03:03:26.000000000 -0500 +++ new/libsemanage/src/ports_file.c 2005-11-04 13:13:43.000000000 -0500 @@ -134,6 +134,9 @@ static int port_parse( semanage_port_set_con(port, con); con = NULL; + if (parse_assert_space(handle, info) < 0) + goto err; + return STATUS_SUCCESS; last: diff -Naurp --exclude CVS --exclude ChangeLog --exclude VERSION --exclude Makefile old/libsemanage/src/seusers_file.c new/libsemanage/src/seusers_file.c --- old/libsemanage/src/seusers_file.c 2005-11-04 03:03:26.000000000 -0500 +++ new/libsemanage/src/seusers_file.c 2005-11-04 13:12:33.000000000 -0500 @@ -96,7 +96,10 @@ static int seuser_parse( goto err; free(str); str = NULL; - } + } + + if (parse_assert_space(handle, info) < 0) + goto err; out: return STATUS_SUCCESS;