From c80d766c8072dd0be311dcd31c17f9719775be44 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Oct 2014 17:49:29 +0200 Subject: mac: rename all calls that apply a label mac_{selinux|smack}_apply_xyz(), and all that reset it to defaults mac_{selinux|smack}_fix() Let's clean up the naming schemes a bit and use the same one for SMACK and for SELINUX. --- src/core/socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/socket.c') diff --git a/src/core/socket.c b/src/core/socket.c index fce1695f07..abe829ade1 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -921,12 +921,12 @@ static void socket_apply_socket_options(Socket *s, int fd) { } if (s->smack_ip_in) - if (mac_smack_set_ip_in_fd(fd, s->smack_ip_in) < 0) - log_error_unit(UNIT(s)->id, "mac_smack_set_ip_in_fd: %m"); + if (mac_smack_apply_ip_in_fd(fd, s->smack_ip_in) < 0) + log_error_unit(UNIT(s)->id, "mac_smack_apply_ip_in_fd: %m"); if (s->smack_ip_out) - if (mac_smack_set_ip_out_fd(fd, s->smack_ip_out) < 0) - log_error_unit(UNIT(s)->id, "mac_smack_set_ip_out_fd: %m"); + if (mac_smack_apply_ip_out_fd(fd, s->smack_ip_out) < 0) + log_error_unit(UNIT(s)->id, "mac_smack_apply_ip_out_fd: %m"); } static void socket_apply_fifo_options(Socket *s, int fd) { @@ -939,8 +939,8 @@ static void socket_apply_fifo_options(Socket *s, int fd) { "F_SETPIPE_SZ: %m"); if (s->smack) - if (mac_smack_set_fd(fd, s->smack) < 0) - log_error_unit(UNIT(s)->id, "mac_smack_set_fd: %m"); + if (mac_smack_apply_fd(fd, s->smack) < 0) + log_error_unit(UNIT(s)->id, "mac_smack_apply_fd: %m"); } static int fifo_address_create( -- cgit v1.2.3-54-g00ecf