c59879b8aa
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- libsepol
73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
From 2cb6bacddcd6957a8f28ce51a089e8514af3d574 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 8 Jun 2021 17:58:50 +0200
|
|
Subject: [PATCH] libsepol: fix typos
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
---
|
|
libsepol/cil/src/cil_build_ast.c | 2 +-
|
|
libsepol/cil/src/cil_resolve_ast.c | 2 +-
|
|
libsepol/src/module_to_cil.c | 2 +-
|
|
libsepol/src/policydb_validate.c | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libsepol/cil/src/cil_build_ast.c b/libsepol/cil/src/cil_build_ast.c
|
|
index 538df2794ade..96c97263d8c8 100644
|
|
--- a/libsepol/cil/src/cil_build_ast.c
|
|
+++ b/libsepol/cil/src/cil_build_ast.c
|
|
@@ -3692,7 +3692,7 @@ int cil_gen_sensitivityorder(struct cil_db *db, struct cil_tree_node *parse_curr
|
|
|
|
cil_list_for_each(curr, sensorder->sens_list_str) {
|
|
if (curr->data == CIL_KEY_UNORDERED) {
|
|
- cil_log(CIL_ERR, "Sensitivy order cannot be unordered.\n");
|
|
+ cil_log(CIL_ERR, "Sensitivity order cannot be unordered.\n");
|
|
rc = SEPOL_ERR;
|
|
goto exit;
|
|
}
|
|
diff --git a/libsepol/cil/src/cil_resolve_ast.c b/libsepol/cil/src/cil_resolve_ast.c
|
|
index 42a58468ed36..92a4d29700e9 100644
|
|
--- a/libsepol/cil/src/cil_resolve_ast.c
|
|
+++ b/libsepol/cil/src/cil_resolve_ast.c
|
|
@@ -1619,7 +1619,7 @@ int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args
|
|
cil_list_for_each(curr, sensorder->sens_list_str) {
|
|
rc = cil_resolve_name(current, (char *)curr->data, CIL_SYM_SENS, extra_args, &datum);
|
|
if (rc != SEPOL_OK) {
|
|
- cil_log(CIL_ERR, "Failed to resolve sensitivty %s in sensitivityorder\n", (char *)curr->data);
|
|
+ cil_log(CIL_ERR, "Failed to resolve sensitivity %s in sensitivityorder\n", (char *)curr->data);
|
|
goto exit;
|
|
}
|
|
if (FLAVOR(datum) != CIL_SENS) {
|
|
diff --git a/libsepol/src/module_to_cil.c b/libsepol/src/module_to_cil.c
|
|
index 19c7c65c6382..60290da2a75f 100644
|
|
--- a/libsepol/src/module_to_cil.c
|
|
+++ b/libsepol/src/module_to_cil.c
|
|
@@ -3972,7 +3972,7 @@ int sepol_module_policydb_to_cil(FILE *fp, struct policydb *pdb, int linked)
|
|
|
|
if (pdb->policy_type != SEPOL_POLICY_BASE &&
|
|
pdb->policy_type != SEPOL_POLICY_MOD) {
|
|
- log_err("Policy pakcage is not a base or module");
|
|
+ log_err("Policy package is not a base or module");
|
|
rc = -1;
|
|
goto exit;
|
|
}
|
|
diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c
|
|
index b2891ddd64f3..246aa6e398f3 100644
|
|
--- a/libsepol/src/policydb_validate.c
|
|
+++ b/libsepol/src/policydb_validate.c
|
|
@@ -641,7 +641,7 @@ static int validate_scope_index(sepol_handle_t *handle, scope_index_t *scope_ind
|
|
return 0;
|
|
|
|
bad:
|
|
- ERR(handle, "Invalide scope");
|
|
+ ERR(handle, "Invalid scope");
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
2.32.0
|
|
|