Add new constant SETRANS_DIR which points to the directory where mstransd can find the socket and libvirt can write its translations files.
This commit is contained in:
parent
ade34f3e98
commit
0781a5c3ae
@ -1,8 +1,16 @@
|
|||||||
diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
|
diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
|
||||||
index a4079aa..82954c2 100644
|
index a4079aa..80ba628 100644
|
||||||
--- a/libselinux/include/selinux/selinux.h
|
--- a/libselinux/include/selinux/selinux.h
|
||||||
+++ b/libselinux/include/selinux/selinux.h
|
+++ b/libselinux/include/selinux/selinux.h
|
||||||
@@ -498,6 +498,7 @@ extern const char *selinux_policy_root(void);
|
@@ -177,6 +177,7 @@ extern void selinux_set_callback(int type, union selinux_callback cb);
|
||||||
|
#define SELINUX_WARNING 1
|
||||||
|
#define SELINUX_INFO 2
|
||||||
|
#define SELINUX_AVC 3
|
||||||
|
+#define SELINUX_TRANS_DIR "/var/run/setrans"
|
||||||
|
|
||||||
|
/* Compute an access decision. */
|
||||||
|
extern int security_compute_av(const security_context_t scon,
|
||||||
|
@@ -498,6 +499,7 @@ extern const char *selinux_policy_root(void);
|
||||||
|
|
||||||
/* These functions return the paths to specific files under the
|
/* These functions return the paths to specific files under the
|
||||||
policy root directory. */
|
policy root directory. */
|
||||||
@ -381,3 +389,16 @@ index 2c7c85c..4a4aebc 100644
|
|||||||
hidden_proto(selinux_binary_policy_path)
|
hidden_proto(selinux_binary_policy_path)
|
||||||
hidden_proto(selinux_booleans_subs_path)
|
hidden_proto(selinux_booleans_subs_path)
|
||||||
hidden_proto(selinux_default_context_path)
|
hidden_proto(selinux_default_context_path)
|
||||||
|
diff --git a/libselinux/src/setrans_internal.h b/libselinux/src/setrans_internal.h
|
||||||
|
index a801ee8..b3bdca2 100644
|
||||||
|
--- a/libselinux/src/setrans_internal.h
|
||||||
|
+++ b/libselinux/src/setrans_internal.h
|
||||||
|
@@ -1,6 +1,7 @@
|
||||||
|
/* Author: Trusted Computer Solutions, Inc. */
|
||||||
|
+#include <selinux/selinux.h>
|
||||||
|
|
||||||
|
-#define SETRANS_UNIX_SOCKET "/var/run/setrans/.setrans-unix"
|
||||||
|
+#define SETRANS_UNIX_SOCKET SELINUX_TRANS_DIR "/.setrans-unix"
|
||||||
|
|
||||||
|
#define RAW_TO_TRANS_CONTEXT 2
|
||||||
|
#define TRANS_TO_RAW_CONTEXT 3
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
Summary: SELinux library and simple utilities
|
Summary: SELinux library and simple utilities
|
||||||
Name: libselinux
|
Name: libselinux
|
||||||
Version: 2.1.13
|
Version: 2.1.13
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: %{name}-%{version}.tgz
|
Source: %{name}-%{version}.tgz
|
||||||
@ -241,6 +241,9 @@ rm -rf %{buildroot}
|
|||||||
%{ruby_sitearch}/selinux.so
|
%{ruby_sitearch}/selinux.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 15 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-4
|
||||||
|
- Add new constant SETRANS_DIR which points to the directory where mstransd can find the socket and libvirt can write its translations files.
|
||||||
|
|
||||||
* Fri Feb 15 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-3
|
* Fri Feb 15 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.13-3
|
||||||
- Bring back selinux_current_policy_path
|
- Bring back selinux_current_policy_path
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user