c81443a124
Copy from security:SELinux/setools based on submit request 34373 from user prusnak OBS-URL: https://build.opensuse.org/request/show/34373 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/setools?expand=0&rev=4
89 lines
2.0 KiB
Diff
89 lines
2.0 KiB
Diff
Index: libqpol/src/module_compiler.c
|
|
===================================================================
|
|
--- libqpol/src/module_compiler.c.orig
|
|
+++ libqpol/src/module_compiler.c
|
|
@@ -257,6 +257,7 @@ role_datum_t *declare_role(void)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
type_datum_t *declare_type(unsigned char primary, unsigned char isattr)
|
|
@@ -324,6 +325,7 @@ type_datum_t *declare_type(unsigned char
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
user_datum_t *declare_user(void)
|
|
@@ -419,6 +421,7 @@ user_datum_t *declare_user(void)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
/* Return a type_datum_t for the local avrule_decl with the given ID.
|
|
@@ -771,6 +774,7 @@ int require_role(int pass)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
static int require_type_or_attribute(int pass, unsigned char isattr)
|
|
@@ -828,6 +832,7 @@ static int require_type_or_attribute(int
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
int require_type(int pass)
|
|
@@ -893,6 +898,7 @@ int require_user(int pass)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
int require_bool(int pass)
|
|
@@ -946,6 +952,7 @@ int require_bool(int pass)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
int require_sens(int pass)
|
|
@@ -1014,6 +1021,7 @@ int require_sens(int pass)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
int require_cat(int pass)
|
|
@@ -1072,6 +1080,7 @@ int require_cat(int pass)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack)
|
|
Index: libqpol/src/policy_define.c
|
|
===================================================================
|
|
--- libqpol/src/policy_define.c.orig
|
|
+++ libqpol/src/policy_define.c
|
|
@@ -1410,6 +1410,7 @@ int define_compute_type(int which)
|
|
assert(0); /* should never get here */
|
|
}
|
|
}
|
|
+ return 0;
|
|
}
|
|
|
|
avrule_t *define_cond_compute_type(int which)
|