Skip to contentSkip to conversation

Correct misc typos

PATCH In review Christian Göttsche 2 participants 3 messages Apr 8, 2022 – Apr 12, 2022 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Correct misc typos

Found by typos[1].

[1]: https://github.com/crate-ci/typos

---
 libsemanage/src/genhomedircon.c             | 2 +-
 libsemanage/src/handle.h                    | 2 +-
 libsemanage/src/semanage_store.c            | 2 +-
 libsemanage/tests/test_iface.c              | 2 +-
 policycoreutils/newrole/newrole.pamd        | 2 +-
 policycoreutils/run_init/run_init.pamd      | 2 +-
 python/sepolgen/src/sepolgen/objectmodel.py | 2 +-
 python/sepolgen/src/sepolgen/refpolicy.py   | 2 +-
 python/sepolgen/tests/test_audit.py         | 2 +-
 python/sepolgen/tests/test_refpolicy.py     | 2 +-
 python/sepolicy/sepolicy-bash-completion.sh | 6 +++---
 python/sepolicy/sepolicy/gui.py             | 4 ++--
 12 files changed, 15 insertions(+), 15 deletions(-)
libsemanage/src/genhomedircon.c +1 -1
index 7ca9afc3..8f8774d3 100644
@@ -490,7 +490,7 @@ static int STR_COMPARATOR(const void *a, const void *b)
 	return strcmp((const char *) a, (const char *) b);
 }
 
-/* make_tempate
+/* make_template
  * @param	s	  the settings holding the paths to various files
  * @param	pred	function pointer to function to use as filter for slurp
  * 					file filter
libsemanage/src/handle.h +1 -1
index 4d2aae8f..c7f4e903 100644
@@ -72,7 +72,7 @@ struct semanage_handle {
 	int do_check_contexts;	/* whether to run setfiles check the file contexts file */
 
 	/* This timeout is used for transactions and waiting for lock
-	   -1 means wait indefinetely
+	   -1 means wait indefinitely
 	   0 means return immediately
 	   >0 means wait that many seconds */
 	int timeout;
libsemanage/src/semanage_store.c +1 -1
index c6d2c5e7..14a0957a 100644
@@ -1327,7 +1327,7 @@ static char **split_args(const char *arg0, char *arg_string,
 		goto cleanup;
 	s = arg_string;
 	/* parse the argument string one character at a time,
-	 * repsecting quotes and other special characters */
+	 * respecting quotes and other special characters */
 	while (s != NULL && *s != '\0') {
 		switch (*s) {
 		case '\\':{
libsemanage/tests/test_iface.c +1 -1
index 434372f8..46937e10 100644
@@ -47,7 +47,7 @@ void test_iface_get_set_msgcon(void);
 void test_iface_create(void);
 void test_iface_clone(void);
 
-/* iterfaces_policy.h */
+/* interfaces_policy.h */
 void test_iface_query(void);
 void test_iface_exists(void);
 void test_iface_count(void);
policycoreutils/newrole/newrole.pamd +1 -1
index de3582f3..683c5441 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 # auth       sufficient   pam_rootok.so
 auth       include	system-auth
 account    include	system-auth
policycoreutils/run_init/run_init.pamd +1 -1
index 1c323d20..ef460134 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 #auth       sufficient   pam_rootok.so
 auth       include	system-auth
 account    include	system-auth
python/sepolgen/src/sepolgen/objectmodel.py +1 -1
index 84955f7c..ccce86c1 100644
@@ -95,7 +95,7 @@ class PermMappings:
     """The information flow properties of a set of object classes and permissions.
 
     PermMappings maps one or more classes and permissions to their PermMap objects
-    describing their information flow charecteristics.
+    describing their information flow characteristics.
     """
     def __init__(self):
         self.classes = { }
python/sepolgen/src/sepolgen/refpolicy.py +1 -1
index 3e907e91..9cac1b95 100644
@@ -34,7 +34,7 @@ import selinux
 # the data structures that we need for policy generation.
 #
 
-# Constans for referring to fields
+# Constants for referring to fields
 SRC_TYPE  = 0
 TGT_TYPE  = 1
 OBJ_CLASS = 2
python/sepolgen/tests/test_audit.py +1 -1
index dbe6be2a..b659bf3b 100644
@@ -230,7 +230,7 @@ class TestGeneration(unittest.TestCase):
 
         self.assertEqual(len(avs), 1)
 
-    def test_genaration_granted(self):
+    def test_generation_granted(self):
         parser = sepolgen.audit.AuditParser()
         parser.parse_string(granted1)
         avs = parser.to_access()
python/sepolgen/tests/test_refpolicy.py +1 -1
index c7219fd5..a24381a6 100644
@@ -144,7 +144,7 @@ class TestSecurityContext(unittest.TestCase):
         self.assertNotEqual(sc1, sc3)
         self.assertNotEqual(sc1, sc4)
 
-class TestObjecClass(unittest.TestCase):
+class TestObjectClass(unittest.TestCase):
     def test_init(self):
         o = refpolicy.ObjectClass(name="file")
         self.assertEqual(o.name, "file")
python/sepolicy/sepolicy-bash-completion.sh +3 -3
index 779fd75b..13638e4d 100644
@@ -36,10 +36,10 @@ __get_all_booleans () {
 __get_all_types () {
     seinfo -t 2> /dev/null | tail -n +3
 }
-__get_all_admin_interaces () {
+__get_all_admin_interfaces () {
     awk '/InterfaceVector.*_admin /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_admin' '{ print $1 }'
 }
-__get_all_user_role_interaces () {
+__get_all_user_role_interfaces () {
     awk '/InterfaceVector.*_role /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_role' '{ print $1 }'
 }
 __get_all_user_domains () {
@@ -139,7 +139,7 @@ _sepolicy () {
                 COMPREPLY=( $(compgen -W "-n --name -t --type" -- "$cur") )
                 return 0
             elif [ "$prev" = "--admin" -o "$prev" = "-a" ]; then
-                COMPREPLY=( $(compgen -W "$( __get_all_admin_interaces ) " -- "$cur") )
+                COMPREPLY=( $(compgen -W "$( __get_all_admin_interfaces ) " -- "$cur") )
                 return 0
             elif [ "$prev" = "--user" -o "$prev" = "-u" ]; then
                 COMPREPLY=( $(compgen -W "$( __get_all_users )" -- "$cur") )
python/sepolicy/sepolicy/gui.py +2 -2
index c9ca158d..4f892f82 100644
@@ -1309,9 +1309,9 @@ class SELinuxGui():
                 filename = i['filename']
             else:
                 filename = None
-            self.transitions_files_inital_data_insert(i['target'], i['class'], i['transtype'], filename)
+            self.transitions_files_initial_data_insert(i['target'], i['class'], i['transtype'], filename)
 
-    def transitions_files_inital_data_insert(self, path, tclass, dest, name):
+    def transitions_files_initial_data_insert(self, path, tclass, dest, name):
         iter = self.transitions_file_liststore.append()
         self.transitions_file_liststore.set_value(iter, 0, path)
         self.transitions_file_liststore.set_value(iter, 1, tclass)
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Christian Göttsche

Found by typos[1].

[1]: https://github.com/crate-ci/typos

Quoted 186 lines
---
 libsemanage/src/genhomedircon.c             | 2 +-
 libsemanage/src/handle.h                    | 2 +-
 libsemanage/src/semanage_store.c            | 2 +-
 libsemanage/tests/test_iface.c              | 2 +-
 policycoreutils/newrole/newrole.pamd        | 2 +-
 policycoreutils/run_init/run_init.pamd      | 2 +-
 python/sepolgen/src/sepolgen/objectmodel.py | 2 +-
 python/sepolgen/src/sepolgen/refpolicy.py   | 2 +-
 python/sepolgen/tests/test_audit.py         | 2 +-
 python/sepolgen/tests/test_refpolicy.py     | 2 +-
 python/sepolicy/sepolicy-bash-completion.sh | 6 +++---
 python/sepolicy/sepolicy/gui.py             | 4 ++--
 12 files changed, 15 insertions(+), 15 deletions(-)
libsemanage/src/genhomedircon.c +1 -1
index 7ca9afc3..8f8774d3 100644
@@ -490,7 +490,7 @@ static int STR_COMPARATOR(const void *a, const void *b)
        return strcmp((const char *) a, (const char *) b);
 }
 
-/* make_tempate
+/* make_template
  * @param      s         the settings holding the paths to various files
  * @param      pred    function pointer to function to use as filter for slurp
  *                                     file filter
libsemanage/src/handle.h +1 -1
index 4d2aae8f..c7f4e903 100644
@@ -72,7 +72,7 @@ struct semanage_handle {
        int do_check_contexts;  /* whether to run setfiles check the file contexts file */
 
        /* This timeout is used for transactions and waiting for lock
-          -1 means wait indefinetely
+          -1 means wait indefinitely
           0 means return immediately
           >0 means wait that many seconds */
        int timeout;
libsemanage/src/semanage_store.c +1 -1
index c6d2c5e7..14a0957a 100644
@@ -1327,7 +1327,7 @@ static char **split_args(const char *arg0, char *arg_string,
                goto cleanup;
        s = arg_string;
        /* parse the argument string one character at a time,
-        * repsecting quotes and other special characters */
+        * respecting quotes and other special characters */
        while (s != NULL && *s != '\0') {
                switch (*s) {
                case '\\':{
libsemanage/tests/test_iface.c +1 -1
index 434372f8..46937e10 100644
@@ -47,7 +47,7 @@ void test_iface_get_set_msgcon(void);
 void test_iface_create(void);
 void test_iface_clone(void);
 
-/* iterfaces_policy.h */
+/* interfaces_policy.h */
 void test_iface_query(void);
 void test_iface_exists(void);
 void test_iface_count(void);
policycoreutils/newrole/newrole.pamd +1 -1
index de3582f3..683c5441 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 # auth       sufficient   pam_rootok.so
 auth       include     system-auth
 account    include     system-auth
policycoreutils/run_init/run_init.pamd +1 -1
index 1c323d20..ef460134 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 #auth       sufficient   pam_rootok.so
 auth       include     system-auth
 account    include     system-auth
python/sepolgen/src/sepolgen/objectmodel.py +1 -1
index 84955f7c..ccce86c1 100644
@@ -95,7 +95,7 @@ class PermMappings:
     """The information flow properties of a set of object classes and permissions.
 
     PermMappings maps one or more classes and permissions to their PermMap objects
-    describing their information flow charecteristics.
+    describing their information flow characteristics.
     """
     def __init__(self):
         self.classes = { }
python/sepolgen/src/sepolgen/refpolicy.py +1 -1
index 3e907e91..9cac1b95 100644
@@ -34,7 +34,7 @@ import selinux
 # the data structures that we need for policy generation.
 #
 
-# Constans for referring to fields
+# Constants for referring to fields
 SRC_TYPE  = 0
 TGT_TYPE  = 1
 OBJ_CLASS = 2
python/sepolgen/tests/test_audit.py +1 -1
index dbe6be2a..b659bf3b 100644
@@ -230,7 +230,7 @@ class TestGeneration(unittest.TestCase):
 
         self.assertEqual(len(avs), 1)
 
-    def test_genaration_granted(self):
+    def test_generation_granted(self):
         parser = sepolgen.audit.AuditParser()
         parser.parse_string(granted1)
         avs = parser.to_access()
python/sepolgen/tests/test_refpolicy.py +1 -1
index c7219fd5..a24381a6 100644
@@ -144,7 +144,7 @@ class TestSecurityContext(unittest.TestCase):
         self.assertNotEqual(sc1, sc3)
         self.assertNotEqual(sc1, sc4)
 
-class TestObjecClass(unittest.TestCase):
+class TestObjectClass(unittest.TestCase):
     def test_init(self):
         o = refpolicy.ObjectClass(name="file")
         self.assertEqual(o.name, "file")
python/sepolicy/sepolicy-bash-completion.sh +3 -3
index 779fd75b..13638e4d 100644
@@ -36,10 +36,10 @@ __get_all_booleans () {
 __get_all_types () {
     seinfo -t 2> /dev/null | tail -n +3
 }
-__get_all_admin_interaces () {
+__get_all_admin_interfaces () {
     awk '/InterfaceVector.*_admin /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_admin' '{ print $1 }'
 }
-__get_all_user_role_interaces () {
+__get_all_user_role_interfaces () {
     awk '/InterfaceVector.*_role /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_role' '{ print $1 }'
 }
 __get_all_user_domains () {
@@ -139,7 +139,7 @@ _sepolicy () {
                 COMPREPLY=( $(compgen -W "-n --name -t --type" -- "$cur") )
                 return 0
             elif [ "$prev" = "--admin" -o "$prev" = "-a" ]; then
-                COMPREPLY=( $(compgen -W "$( __get_all_admin_interaces ) " -- "$cur") )
+                COMPREPLY=( $(compgen -W "$( __get_all_admin_interfaces ) " -- "$cur") )
                 return 0
             elif [ "$prev" = "--user" -o "$prev" = "-u" ]; then
                 COMPREPLY=( $(compgen -W "$( __get_all_users )" -- "$cur") )
python/sepolicy/sepolicy/gui.py +2 -3
index c9ca158d..4f892f82 100644
@@ -1309,9 +1309,9 @@ class SELinuxGui():
                 filename = i['filename']
             else:
                 filename = None
-            self.transitions_files_inital_data_insert(i['target'], i['class'], i['transtype'], filename)
+            self.transitions_files_initial_data_insert(i['target'], i['class'], i['transtype'], filename)
 
-    def transitions_files_inital_data_insert(self, path, tclass, dest, name):
+    def transitions_files_initial_data_insert(self, path, tclass, dest, name):
         iter = self.transitions_file_liststore.append()
         self.transitions_file_liststore.set_value(iter, 0, path)
         self.transitions_file_liststore.set_value(iter, 1, tclass)
--

2.35.1

#2 lore raw
Quoted 4 lines · James Carter
Quoted 1 line · Christian Göttsche
Quoted 8 lines
Quoted 5 lines

Found by typos[1].

[1]: https://github.com/crate-ci/typos

Merged.
thanks,
Jim

Quoted 186 lines
Quoted 186 lines
---
 libsemanage/src/genhomedircon.c             | 2 +-
 libsemanage/src/handle.h                    | 2 +-
 libsemanage/src/semanage_store.c            | 2 +-
 libsemanage/tests/test_iface.c              | 2 +-
 policycoreutils/newrole/newrole.pamd        | 2 +-
 policycoreutils/run_init/run_init.pamd      | 2 +-
 python/sepolgen/src/sepolgen/objectmodel.py | 2 +-
 python/sepolgen/src/sepolgen/refpolicy.py   | 2 +-
 python/sepolgen/tests/test_audit.py         | 2 +-
 python/sepolgen/tests/test_refpolicy.py     | 2 +-
 python/sepolicy/sepolicy-bash-completion.sh | 6 +++---
 python/sepolicy/sepolicy/gui.py             | 4 ++--
 12 files changed, 15 insertions(+), 15 deletions(-)
libsemanage/src/genhomedircon.c +1 -1
index 7ca9afc3..8f8774d3 100644
@@ -490,7 +490,7 @@ static int STR_COMPARATOR(const void *a, const void *b)
        return strcmp((const char *) a, (const char *) b);
 }
 
-/* make_tempate
+/* make_template
  * @param      s         the settings holding the paths to various files
  * @param      pred    function pointer to function to use as filter for slurp
  *                                     file filter
libsemanage/src/handle.h +1 -1
index 4d2aae8f..c7f4e903 100644
@@ -72,7 +72,7 @@ struct semanage_handle {
        int do_check_contexts;  /* whether to run setfiles check the file contexts file */
 
        /* This timeout is used for transactions and waiting for lock
-          -1 means wait indefinetely
+          -1 means wait indefinitely
           0 means return immediately
           >0 means wait that many seconds */
        int timeout;
libsemanage/src/semanage_store.c +1 -1
index c6d2c5e7..14a0957a 100644
@@ -1327,7 +1327,7 @@ static char **split_args(const char *arg0, char *arg_string,
                goto cleanup;
        s = arg_string;
        /* parse the argument string one character at a time,
-        * repsecting quotes and other special characters */
+        * respecting quotes and other special characters */
        while (s != NULL && *s != '\0') {
                switch (*s) {
                case '\\':{
libsemanage/tests/test_iface.c +1 -1
index 434372f8..46937e10 100644
@@ -47,7 +47,7 @@ void test_iface_get_set_msgcon(void);
 void test_iface_create(void);
 void test_iface_clone(void);
 
-/* iterfaces_policy.h */
+/* interfaces_policy.h */
 void test_iface_query(void);
 void test_iface_exists(void);
 void test_iface_count(void);
policycoreutils/newrole/newrole.pamd +1 -1
index de3582f3..683c5441 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 # auth       sufficient   pam_rootok.so
 auth       include     system-auth
 account    include     system-auth
policycoreutils/run_init/run_init.pamd +1 -1
index 1c323d20..ef460134 100644
@@ -1,5 +1,5 @@
 #%PAM-1.0
-# Uncomment the next line if you do not want to enter your passwd everytime
+# Uncomment the next line if you do not want to enter your passwd every time
 #auth       sufficient   pam_rootok.so
 auth       include     system-auth
 account    include     system-auth
python/sepolgen/src/sepolgen/objectmodel.py +1 -1
index 84955f7c..ccce86c1 100644
@@ -95,7 +95,7 @@ class PermMappings:
     """The information flow properties of a set of object classes and permissions.
 
     PermMappings maps one or more classes and permissions to their PermMap objects
-    describing their information flow charecteristics.
+    describing their information flow characteristics.
     """
     def __init__(self):
         self.classes = { }
python/sepolgen/src/sepolgen/refpolicy.py +1 -1
index 3e907e91..9cac1b95 100644
@@ -34,7 +34,7 @@ import selinux
 # the data structures that we need for policy generation.
 #
 
-# Constans for referring to fields
+# Constants for referring to fields
 SRC_TYPE  = 0
 TGT_TYPE  = 1
 OBJ_CLASS = 2
python/sepolgen/tests/test_audit.py +1 -1
index dbe6be2a..b659bf3b 100644
@@ -230,7 +230,7 @@ class TestGeneration(unittest.TestCase):
 
         self.assertEqual(len(avs), 1)
 
-    def test_genaration_granted(self):
+    def test_generation_granted(self):
         parser = sepolgen.audit.AuditParser()
         parser.parse_string(granted1)
         avs = parser.to_access()
python/sepolgen/tests/test_refpolicy.py +1 -1
index c7219fd5..a24381a6 100644
@@ -144,7 +144,7 @@ class TestSecurityContext(unittest.TestCase):
         self.assertNotEqual(sc1, sc3)
         self.assertNotEqual(sc1, sc4)
 
-class TestObjecClass(unittest.TestCase):
+class TestObjectClass(unittest.TestCase):
     def test_init(self):
         o = refpolicy.ObjectClass(name="file")
         self.assertEqual(o.name, "file")
python/sepolicy/sepolicy-bash-completion.sh +3 -3
index 779fd75b..13638e4d 100644
@@ -36,10 +36,10 @@ __get_all_booleans () {
 __get_all_types () {
     seinfo -t 2> /dev/null | tail -n +3
 }
-__get_all_admin_interaces () {
+__get_all_admin_interfaces () {
     awk '/InterfaceVector.*_admin /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_admin' '{ print $1 }'
 }
-__get_all_user_role_interaces () {
+__get_all_user_role_interfaces () {
     awk '/InterfaceVector.*_role /{ print $2 }' /var/lib/sepolgen/interface_info | awk -F '_role' '{ print $1 }'
 }
 __get_all_user_domains () {
@@ -139,7 +139,7 @@ _sepolicy () {
                 COMPREPLY=( $(compgen -W "-n --name -t --type" -- "$cur") )
                 return 0
             elif [ "$prev" = "--admin" -o "$prev" = "-a" ]; then
-                COMPREPLY=( $(compgen -W "$( __get_all_admin_interaces ) " -- "$cur") )
+                COMPREPLY=( $(compgen -W "$( __get_all_admin_interfaces ) " -- "$cur") )
                 return 0
             elif [ "$prev" = "--user" -o "$prev" = "-u" ]; then
                 COMPREPLY=( $(compgen -W "$( __get_all_users )" -- "$cur") )
python/sepolicy/sepolicy/gui.py +2 -3
index c9ca158d..4f892f82 100644
@@ -1309,9 +1309,9 @@ class SELinuxGui():
                 filename = i['filename']
             else:
                 filename = None
-            self.transitions_files_inital_data_insert(i['target'], i['class'], i['transtype'], filename)
+            self.transitions_files_initial_data_insert(i['target'], i['class'], i['transtype'], filename)
 
-    def transitions_files_inital_data_insert(self, path, tclass, dest, name):
+    def transitions_files_initial_data_insert(self, path, tclass, dest, name):
         iter = self.transitions_file_liststore.append()
         self.transitions_file_liststore.set_value(iter, 0, path)
         self.transitions_file_liststore.set_value(iter, 1, tclass)
--

2.35.1