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 cf0ed662b3ade44aea8ff3fd768971014566e7b4..adb09de3dda7b9395f24efdf81e08bbd79a1f878 100644 (file)
--- 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 fb33f82983bc3709909d6a641c29d2cb14cb5eb2..8ce1249ad5137f940a74a3228ab210d0db4c3dba 100644 (file)
--- 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 a06a0ec7c99555830b9077b45da6a8afc8e1e57f..f094cdeb7e0a9c60a41655d5e412153a9489369e 100644 (file)
--- 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 e2ed81d555917b87faa8e0eb2c6060d9b6ca7fbd..2c1efb1175cb9e7e88a83a806503374bf5f1ff55 100644 (file)
--- 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);
        }