External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos s/HAVE_SELINUX/WITH_SELINUX/

Browse Source 
The virNetSocket & virIdentity classes accidentally got some
conditionals using HAVE_SELINUX instead of WITH_SELINUX.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-03-20 13:06:04 +00:00
parent 4dceffadc9
commit f07f9733cb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rpc/virnetsocket.c
View File

@ -40,7 +40,7 @@
#endif
#include "c-ctype.h"
#ifdef HAVE_SELINUX
#ifdef WITH_SELINUX
# include <selinux/selinux.h>
#endif
@ -1160,7 +1160,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,
}
#endif
#ifdef HAVE_SELINUX
#ifdef WITH_SELINUX
int virNetSocketGetSecurityContext(virNetSocketPtr sock,
char **context)
{
@ -1169,7 +1169,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock,
*context = NULL;
virMutexLock(&sock->lock);
virObjectLock(sock);
if (getpeercon(sock->fd, &seccon) < 0) {
if (errno == ENOSYS) {
ret = 0;
@ -1188,7 +1188,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock,
ret = 0;
cleanup:
freecon(seccon);
virMutexUnlock(&sock->lock);
virObjectUnlock(sock);
return ret;
}
#else

6
src/util/viridentity.c
View File

@ -22,7 +22,7 @@
#include <config.h>
#include <unistd.h>
#if HAVE_SELINUX
#if WITH_SELINUX
# include <selinux/selinux.h>
#endif
@ -135,7 +135,7 @@ virIdentityPtr virIdentityGetSystem(void)
char *groupname = NULL;
char *seccontext = NULL;
virIdentityPtr ret = NULL;
#if HAVE_SELINUX
#if WITH_SELINUX
security_context_t con;
#endif
@ -144,7 +144,7 @@ virIdentityPtr virIdentityGetSystem(void)
if (!(groupname = virGetGroupName(getgid())))
goto cleanup;
#if HAVE_SELINUX
#if WITH_SELINUX
if (getcon(&con) < 0) {
virReportSystemError(errno, "%s",
_("Unable to lookup SELinux process context"));