From: Karel Zak <kzak@redhat.com>
Date: Wed, 13 Jan 2021 12:33:41 +0000 (+0100)
Subject: lib/selinux-utils: cleanup function names
X-Git-Tag: v2.37-rc1~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5debf7105a4c63ac8d2d8c79655559c8f1dc52d;p=thirdparty%2Futil-linux.git

lib/selinux-utils: cleanup function names

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/selinux-utils.h b/include/selinux-utils.h
index cf0ed662b3..adb09de3dd 100644
--- a/include/selinux-utils.h
+++ b/include/selinux-utils.h
@@ -2,6 +2,6 @@
 #define UTIL_LINUX_SELINUX_UTILS_H
 
 extern access_vector_t get_access_vector(const char *tclass, const char *op);
-extern int setupDefaultContext(char *orig_file);
+extern int ul_setfscreatecon_from_file(char *orig_file);
 
 #endif
diff --git a/lib/selinux-utils.c b/lib/selinux-utils.c
index fb33f82983..8ce1249ad5 100644
--- a/lib/selinux-utils.c
+++ b/lib/selinux-utils.c
@@ -13,7 +13,7 @@ access_vector_t get_access_vector(const char *tclass, const char *op)
 	return tc ? string_to_av_perm(tc, op) : 0;
 }
 
-int setupDefaultContext(char *orig_file)
+int ul_setfscreatecon_from_file(char *orig_file)
 {
 	if (is_selinux_enabled() > 0) {
 		char *scontext = NULL;
diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index a06a0ec7c9..f094cdeb7e 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -454,7 +454,7 @@ int main(int argc, char **argv)
 				     ctl.username);
 			}
 		}
-		if (setupDefaultContext(_PATH_PASSWD))
+		if (ul_setfscreatecon_from_file(_PATH_PASSWD))
 			errx(EXIT_FAILURE,
 			     _("can't set default context for %s"), _PATH_PASSWD);
 	}
diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index e2ed81d555..2c1efb1175 100644
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
 				     pw->pw_name);
 			}
 		}
-		if (setupDefaultContext(_PATH_PASSWD) != 0)
+		if (ul_setfscreatecon_from_file(_PATH_PASSWD) != 0)
 			errx(EXIT_FAILURE,
 			     _("can't set default context for %s"), _PATH_PASSWD);
 	}