From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3739-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 26356 invoked by alias); 13 Dec 2010 12:30:07 -0000
Received: (qmail 26330 invoked by uid 9796); 13 Dec 2010 12:30:07 -0000
Date: Mon, 13 Dec 2010 12:30:00 -0000
Message-ID: <20101213123006.26328.qmail@sourceware.org>
From: prajnoha@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-common.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-12/txt/msg00028.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2010-12-13 12:30:05

Modified files:
	libdm          : libdm-common.c 

Log message:
	#ifdef HAVE_SELINUX and #ifdef HAVE_SELINUX_LABEL_H

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-common.c.diff?cvsroot=lvm2&r1=1.104&r2=1.105

--- LVM2/libdm/libdm-common.c	2010/12/13 12:18:38	1.104
+++ LVM2/libdm/libdm-common.c	2010/12/13 12:30:04	1.105
@@ -390,6 +390,7 @@
 static int _selabel_lookup(const char *path, mode_t mode,
 			   security_context_t *scontext)
 {
+#ifdef HAVE_SELINUX
 #ifdef HAVE_SELINUX_LABEL_H
 	if (!_selabel_handle &&
 	    !(_selabel_handle = selabel_open(SELABEL_CTX_FILE, NULL, 0))) {
@@ -401,12 +402,13 @@
 		log_error("selabel_lookup failed: %s", strerror(errno));
 		return 0;
 	}
-#elif HAVE_SELINUX
+#else
 	if (matchpathcon(path, mode, scontext)) {
 		log_error("matchpathcon failed: %s", strerror(errno));
 		return 0;
 	}
 #endif
+#endif
 	return 1;
 }