From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3740-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 17867 invoked by alias); 13 Dec 2010 12:44:11 -0000
Received: (qmail 17846 invoked by uid 9796); 13 Dec 2010 12:44:11 -0000
Date: Mon, 13 Dec 2010 12:44:00 -0000
Message-ID: <20101213124411.17844.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/msg00029.txt.bz2

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

Modified files:
	libdm          : libdm-common.c 

Log message:
	HAVE_SELINUX again

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

--- LVM2/libdm/libdm-common.c	2010/12/13 12:30:04	1.105
+++ LVM2/libdm/libdm-common.c	2010/12/13 12:44:09	1.106
@@ -387,10 +387,10 @@
 	return 1;
 }
 
+#ifdef HAVE_SELINUX
 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))) {
@@ -408,9 +408,9 @@
 		return 0;
 	}
 #endif
-#endif
 	return 1;
 }
+#endif
 
 int dm_prepare_selinux_context(const char *path, mode_t mode)
 {