Prep v234: Apply missing upstream fixes in src/basic (1/6)

[elogind.git] / src / basic / selinux-util.h

diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h
index 559b0d6dfe598188d098ae3e638abcb270693c99..2a71afefabe2e4d4282d1865c6948b93fec75f56 100644 (file)
--- a/src/basic/selinux-util.h
+++ b/src/basic/selinux-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -21,28 +19,36 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <stdbool.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include "macro.h"
 
 bool mac_selinux_use(void);
-// UNNEEDED void mac_selinux_retest(void);
+void mac_selinux_retest(void);
 
-int mac_selinux_init(const char *prefix);
-// UNNEEDED void mac_selinux_finish(void);
+int mac_selinux_init(void);
+void mac_selinux_finish(void);
 
 int mac_selinux_fix(const char *path, bool ignore_enoent, bool ignore_erofs);
-// UNNEEDED int mac_selinux_apply(const char *path, const char *label);
+#if 0 /// UNNEEDED by elogind
+int mac_selinux_apply(const char *path, const char *label);
 
-// UNNEEDED int mac_selinux_get_create_label_from_exe(const char *exe, char **label);
-// UNNEEDED int mac_selinux_get_our_label(char **label);
-// UNNEEDED int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, const char *exec_label, char **label);
-// UNNEEDED void mac_selinux_free(char *label);
+int mac_selinux_get_create_label_from_exe(const char *exe, char **label);
+int mac_selinux_get_our_label(char **label);
+int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, const char *exec_label, char **label);
+#endif // 0
+char* mac_selinux_free(char *label);
 
 int mac_selinux_create_file_prepare(const char *path, mode_t mode);
 void mac_selinux_create_file_clear(void);
+#if 0 /// UNNEEDED by elogind
+
+int mac_selinux_create_socket_prepare(const char *label);
+void mac_selinux_create_socket_clear(void);
 
-// UNNEEDED int mac_selinux_create_socket_prepare(const char *label);
-// UNNEEDED void mac_selinux_create_socket_clear(void);
+int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen);
+#endif // 0
 
-// UNNEEDED int mac_selinux_bind(int fd, const struct sockaddr *addr, socklen_t addrlen);
+DEFINE_TRIVIAL_CLEANUP_FUNC(char*, mac_selinux_free);