shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

Use matchpathcon mode parameter.

Browse Source
This commit is contained in:
Alasdair Kergon 2005-06-13 13:13:15 +00:00
parent c8c07bbedc
commit 56c3d1f7fc
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WHATS_NEW
View File

@ -1,5 +1,7 @@
Version 2.01.11 - Version 2.01.11 -
============================== ==============================
Use matchpathcon mode parameter.
Don't defer closing dead FDs in clvmd.
Remove hard-coded 64k text metadata writing restriction. Remove hard-coded 64k text metadata writing restriction.
Make VG name restrictions consistent. Make VG name restrictions consistent.
Introduce lvconvert. So far only removes mirror images. Introduce lvconvert. So far only removes mirror images.
@ -36,7 +38,6 @@ Version 2.01.11 -
lv_reduce tidying. lv_reduce tidying.
Remove some unnecessary parameters. Remove some unnecessary parameters.
Introduce seg_is macros. Introduce seg_is macros.
Don't defer closing dead FDs in clvmd.
Version 2.01.10 - 3rd May 2005 Version 2.01.10 - 3rd May 2005
============================== ==============================

2
lib/activate/fs.c
View File

@ -180,7 +180,7 @@ static int _mk_link(const char *dev_dir, const char *vg_name,
} }
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
if (!set_selinux_context(lv_path)) { if (!set_selinux_context(lv_path, S_IFLNK)) {
stack; stack;
return 0; return 0;
} }

13
lib/misc/selinux.c
View File

@ -18,27 +18,28 @@
#include <selinux/selinux.h> #include <selinux/selinux.h>
int set_selinux_context(const char *path) int set_selinux_context(const char *path, mode_t mode)
{ {
security_context_t scontext; security_context_t scontext;
if (is_selinux_enabled() <= 0) if (is_selinux_enabled() <= 0)
return 1; return 1;
if (matchpathcon(path, 0, &scontext) < 0) { if (matchpathcon(path, mode, &scontext) < 0) {
log_sys_error("matchpathcon", path); log_error("%s: matchpathcon %07o failed: %s", path, mode,
strerror(errno));
return 0; return 0;
} }
log_very_verbose("Setting SELinux context for %s to %s", log_very_verbose("Setting SELinux context for %s to %s.",
path, scontext); path, scontext);
if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) { if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) {
log_sys_error("lsetfilecon", path); log_sys_error("lsetfilecon", path);
free(scontext); freecon(scontext);
return 0; return 0;
} }
free(scontext); freecon(scontext);
return 1; return 1;
} }

4
lib/misc/selinux.h
View File

@ -15,6 +15,8 @@
#ifndef _LVM_SELINUX_H #ifndef _LVM_SELINUX_H
#define _LVM_SELINUX_H #define _LVM_SELINUX_H
int set_selinux_context(const char * path); #include <sys/types.h>
int set_selinux_context(const char * path, mode_t mode);
#endif #endif