--- checkpolicy.old/module_compiler.c 2005-08-22 15:16:41.000000000 -0400 +++ checkpolicy/module_compiler.c 2005-08-31 13:25:25.000000000 -0400 @@ -145,9 +145,11 @@ int declare_symbol(uint32_t symbol_type, else if (retval == -2) { return -2; } - else if (retval == -1 || retval == -ENOMEM) { + else if (retval < 0) { return -3; } + else { /* fall through possible if retval is 0 */ + } if (datum_value != NULL) { if (ebitmap_set_bit(decl->declared.scope + symbol_type, *datum_value - 1, @@ -497,9 +499,11 @@ int require_symbol(uint32_t symbol_type, else if (retval == -2) { return -2; } - else if (retval == -1 || retval == -ENOMEM) { + else if (retval < 0) { return -3; } + else { /* fall through possible if retval is 0 */ + } if (datum_value != NULL) { if (ebitmap_set_bit(decl->required.scope + symbol_type, *datum_value - 1,