mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
mkdir,mkfifo,mknod: with -Z, create SMACK security context
Enable creation of SMACK security context with -Z command-line switch
if SMACK is enabled.
* mkdir.c (main): Set process security context to given SMACK label.
* mkfifo.c (main): Likewise.
* mknod.c (main): Likewise.
* src/local.mk: link mk{dir, fifo, nod} with libsmack.
* NEWS: Mention the new feature.
This commit is contained in:
1 parent
1b90421a1b
commit
7d5976f668
5 files changed
+53
-4
No files matched your search
@@ -29,7 +29,8 @@ GNU coreutils NEWS -*- outline -*-
|
||||
|
||||
** New features
|
||||
|
||||
ls -Z and id -Z report the SMACK security context where available.
|
||||
id and ls with -Z report the SMACK security context where available.
|
||||
mkdir, mkfifo and mknod with -Z set the SMACK context where available.
|
||||
|
||||
join accepts a new option: --zero-terminated (-z). As with the sort,uniq
|
||||
option of the same name, this makes join consume and produce NUL-terminated
|
||||
|
||||
@@ -232,8 +232,11 @@ src_id_LDADD += $(LIB_SMACK)
|
||||
src_ls_LDADD += $(LIB_SELINUX)
|
||||
src_ls_LDADD += $(LIB_SMACK)
|
||||
src_mkdir_LDADD += $(LIB_SELINUX)
|
||||
src_mkdir_LDADD += $(LIB_SMACK)
|
||||
src_mkfifo_LDADD += $(LIB_SELINUX)
|
||||
src_mkfifo_LDADD += $(LIB_SMACK)
|
||||
src_mknod_LDADD += $(LIB_SELINUX)
|
||||
src_mknod_LDADD += $(LIB_SMACK)
|
||||
src_runcon_LDADD += $(LIB_SELINUX)
|
||||
src_stat_LDADD += $(LIB_SELINUX)
|
||||
|
||||
|
||||
+16
-1
@@ -22,6 +22,10 @@
|
||||
#include <sys/types.h>
|
||||
#include <selinux/selinux.h>
|
||||
|
||||
#ifdef HAVE_SMACK
|
||||
# include <sys/smack.h>
|
||||
#endif
|
||||
|
||||
#include "system.h"
|
||||
#include "error.h"
|
||||
#include "mkdir-p.h"
|
||||
@@ -151,6 +155,7 @@ main (int argc, char **argv)
|
||||
int optc;
|
||||
security_context_t scontext = NULL;
|
||||
struct mkdir_options options;
|
||||
int ret = 0;
|
||||
|
||||
options.make_ancestor_function = NULL;
|
||||
options.mode = S_IRWXUGO;
|
||||
@@ -194,7 +199,17 @@ main (int argc, char **argv)
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (scontext && setfscreatecon (scontext) < 0)
|
||||
if (scontext)
|
||||
{
|
||||
#ifdef HAVE_SMACK
|
||||
if (smack_smackfs_path ())
|
||||
ret = smack_set_label_for_self (scontext);
|
||||
else
|
||||
#endif
|
||||
ret = setfscreatecon (scontext);
|
||||
}
|
||||
|
||||
if (ret < 0)
|
||||
error (EXIT_FAILURE, errno,
|
||||
_("failed to set default file creation context to %s"),
|
||||
quote (scontext));
|
||||
|
||||
+16
-1
@@ -22,6 +22,10 @@
|
||||
#include <sys/types.h>
|
||||
#include <selinux/selinux.h>
|
||||
|
||||
#ifdef HAVE_SMACK
|
||||
# include <sys/smack.h>
|
||||
#endif
|
||||
|
||||
#include "system.h"
|
||||
#include "error.h"
|
||||
#include "modechange.h"
|
||||
@@ -76,6 +80,7 @@ main (int argc, char **argv)
|
||||
int exit_status = EXIT_SUCCESS;
|
||||
int optc;
|
||||
security_context_t scontext = NULL;
|
||||
int ret = 0;
|
||||
|
||||
initialize_main (&argc, &argv);
|
||||
set_program_name (argv[0]);
|
||||
@@ -108,7 +113,17 @@ main (int argc, char **argv)
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (scontext && setfscreatecon (scontext) < 0)
|
||||
if (scontext)
|
||||
{
|
||||
#ifdef HAVE_SMACK
|
||||
if (smack_smackfs_path ())
|
||||
ret = smack_set_label_for_self (scontext);
|
||||
else
|
||||
#endif
|
||||
ret = setfscreatecon (scontext);
|
||||
}
|
||||
|
||||
if (ret < 0)
|
||||
error (EXIT_FAILURE, errno,
|
||||
_("failed to set default file creation context to %s"),
|
||||
quote (scontext));
|
||||
|
||||
+16
-1
@@ -22,6 +22,10 @@
|
||||
#include <sys/types.h>
|
||||
#include <selinux/selinux.h>
|
||||
|
||||
#ifdef HAVE_SMACK
|
||||
# include <sys/smack.h>
|
||||
#endif
|
||||
|
||||
#include "system.h"
|
||||
#include "error.h"
|
||||
#include "modechange.h"
|
||||
@@ -93,6 +97,7 @@ main (int argc, char **argv)
|
||||
int expected_operands;
|
||||
mode_t node_type;
|
||||
security_context_t scontext = NULL;
|
||||
int ret = 0;
|
||||
|
||||
initialize_main (&argc, &argv);
|
||||
set_program_name (argv[0]);
|
||||
@@ -164,7 +169,17 @@ main (int argc, char **argv)
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (scontext && setfscreatecon (scontext) < 0)
|
||||
if (scontext)
|
||||
{
|
||||
#ifdef HAVE_SMACK
|
||||
if (smack_smackfs_path ())
|
||||
ret = smack_set_label_for_self (scontext);
|
||||
else
|
||||
#endif
|
||||
ret = setfscreatecon (scontext);
|
||||
}
|
||||
|
||||
if (ret < 0)
|
||||
error (EXIT_FAILURE, errno,
|
||||
_("failed to set default file creation context to %s"),
|
||||
quote (scontext));
|
||||
|
||||
Reference in new issue
Block a user