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

Move set_selinux_context into libdevmapper

Browse Source
This commit is contained in:
Alasdair Kergon 2005-10-25 17:28:46 +00:00
parent 78aa12e1dc
commit ffbfce30b5
6 changed files with 2 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.00 - Version 2.02.00 -
=================================== ===================================
Move set_selinux_context into libdevmapper.
Fix automatic text metadata buffer expansion (using macro). Fix automatic text metadata buffer expansion (using macro).
Cache formatted text metadata buffer between metadata area writes. Cache formatted text metadata buffer between metadata area writes.
Add pe_start field to pvs. Add pe_start field to pvs.

1
include/.symlinks
View File

@ -40,7 +40,6 @@
../lib/misc/lvm-exec.h ../lib/misc/lvm-exec.h
../lib/misc/lvm-file.h ../lib/misc/lvm-file.h
../lib/misc/lvm-string.h ../lib/misc/lvm-string.h
../lib/misc/selinux.h
../lib/misc/sharedlib.h ../lib/misc/sharedlib.h
../lib/regex/matcher.h ../lib/regex/matcher.h
../lib/report/report.h ../lib/report/report.h

4
lib/Makefile.in
View File

@ -133,10 +133,6 @@ ifeq ("@HAVE_LIBDL@", "yes")
misc/sharedlib.c misc/sharedlib.c
endif endif
ifeq ("@HAVE_SELINUX@", "yes")
SOURCES += misc/selinux.c
endif
LIB_STATIC = liblvm.a LIB_STATIC = liblvm.a
$(SUBDIRS): $(LIB_STATIC) $(SUBDIRS): $(LIB_STATIC)

6
lib/activate/fs.c
View File

@ -20,10 +20,6 @@
#include "lvm-file.h" #include "lvm-file.h"
#include "memlock.h" #include "memlock.h"
#ifdef HAVE_SELINUX
# include "selinux.h"
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
@ -179,7 +175,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, S_IFLNK)) { if (!dm_set_selinux_context(lv_path, S_IFLNK)) {
stack; stack;
return 0; return 0;
} }

45
lib/misc/selinux.c
View File

@ -1,45 +0,0 @@
/*
* Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
* Copyright (C) 2004 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "lib.h"
#include "selinux.h"
#include <selinux/selinux.h>
int set_selinux_context(const char *path, mode_t mode)
{
security_context_t scontext;
if (is_selinux_enabled() <= 0)
return 1;
if (matchpathcon(path, mode, &scontext) < 0) {
log_error("%s: matchpathcon %07o failed: %s", path, mode,
strerror(errno));
return 0;
}
log_very_verbose("Setting SELinux context for %s to %s.",
path, scontext);
if ((lsetfilecon(path, scontext) < 0) && (errno != ENOTSUP)) {
log_sys_error("lsetfilecon", path);
freecon(scontext);
return 0;
}
freecon(scontext);
return 1;
}

22
lib/misc/selinux.h
View File

@ -1,22 +0,0 @@
/*
* Copyright (C) 2004 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU General Public License v.2.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _LVM_SELINUX_H
#define _LVM_SELINUX_H
#include <sys/types.h>
int set_selinux_context(const char * path, mode_t mode);
#endif