chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused variables
[elogind.git]
/
udev_selinux.c
diff --git
a/udev_selinux.c
b/udev_selinux.c
index 72381f0d0d450e19d97d9019084efe308c9fde01..f014ea55359d6653950a419fd33827dff76e2cf9 100644
(file)
--- a/
udev_selinux.c
+++ b/
udev_selinux.c
@@
-100,12
+100,12
@@
void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
if (ret < 0)
if (matchpathcon(file, mode, &scontext) < 0) {
if (ret < 0)
if (matchpathcon(file, mode, &scontext) < 0) {
-
dbg
("matchpathcon(%s) failed\n", file);
+
err
("matchpathcon(%s) failed\n", file);
return;
}
if (setfilecon(file, scontext) < 0)
return;
}
if (setfilecon(file, scontext) < 0)
-
dbg("setfiles %s failed with error '%s'
", file, strerror(errno));
+
err("setfilecon %s failed: %s
", file, strerror(errno));
freecon(scontext);
}
freecon(scontext);
}
@@
-126,17
+126,25
@@
void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
if (ret < 0)
if (matchpathcon(file, mode, &scontext) < 0) {
if (ret < 0)
if (matchpathcon(file, mode, &scontext) < 0) {
-
dbg
("matchpathcon(%s) failed\n", file);
+
err
("matchpathcon(%s) failed\n", file);
return;
}
if (setfscreatecon(scontext) < 0)
return;
}
if (setfscreatecon(scontext) < 0)
-
dbg("setfiles %s failed with error '%s'
", file, strerror(errno));
+
err("setfscreatecon %s failed: %s
", file, strerror(errno));
freecon(scontext);
}
}
freecon(scontext);
}
}
+void selinux_resetfscreatecon(void)
+{
+ if (is_selinux_running()) {
+ if (setfscreatecon(prev_scontext) < 0)
+ err("setfscreatecon failed: %s", strerror(errno));
+ }
+}
+
void selinux_init(void)
{
/*
void selinux_init(void)
{
/*
@@
-144,23
+152,18
@@
void selinux_init(void)
* restoration creation purposes.
*/
if (is_selinux_running()) {
* restoration creation purposes.
*/
if (is_selinux_running()) {
- if (getfscreatecon(&prev_scontext) < 0)
- dbg("getfscreatecon failed\n");
-
- prev_scontext = NULL;
+ matchpathcon_init_prefix(NULL, "/dev");
+ if (getfscreatecon(&prev_scontext) < 0) {
+ err("getfscreatecon failed\n");
+ prev_scontext = NULL;
+ }
}
}
}
}
-void selinux_
restore
(void)
+void selinux_
exit
(void)
{
{
- if (is_selinux_running()) {
- /* reset the file create context to its former glory */
- if (setfscreatecon(prev_scontext) < 0)
- dbg("setfscreatecon failed\n");
-
- if (prev_scontext) {
- freecon(prev_scontext);
- prev_scontext = NULL;
- }
+ if (is_selinux_running() && prev_scontext) {
+ freecon(prev_scontext);
+ prev_scontext = NULL;
}
}
}
}