chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: info - add --export format to --device-id-of-file=
[elogind.git]
/
udev_selinux.c
diff --git
a/udev_selinux.c
b/udev_selinux.c
index a305e241367e18dc1fafaeebc5765e0fe4c58eeb..eec950194c3e7cd7bf62aac2443164544232d36e 100644
(file)
--- a/
udev_selinux.c
+++ b/
udev_selinux.c
@@
-24,8
+24,8
@@
#include <fcntl.h>
#include <ctype.h>
#include <limits.h>
#include <fcntl.h>
#include <ctype.h>
#include <limits.h>
-#include <libgen.h>
#include <errno.h>
#include <errno.h>
+#include <sys/stat.h>
#include <selinux/selinux.h>
#include "udev.h"
#include <selinux/selinux.h>
#include "udev.h"
@@
-40,7
+40,7
@@
static int is_selinux_running(void)
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
if (selinux_enabled == -1)
selinux_enabled = (is_selinux_enabled() > 0);
- dbg("selinux=%i", selinux_enabled);
+ dbg("selinux=%i
\n
", selinux_enabled);
return selinux_enabled;
}
return selinux_enabled;
}
@@
-90,8
+90,7
@@
void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
char *media;
int ret = -1;
char *media;
int ret = -1;
- if(devname)
- {
+ if (devname) {
media = get_media(devname, mode);
if (media) {
ret = matchmediacon(media, &scontext);
media = get_media(devname, mode);
if (media) {
ret = matchmediacon(media, &scontext);
@@
-106,7
+105,7
@@
void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
}
if (lsetfilecon(file, scontext) < 0)
}
if (lsetfilecon(file, scontext) < 0)
- err("setfilecon %s failed: %s", file, strerror(errno));
+ err("setfilecon %s failed: %s
\n
", file, strerror(errno));
freecon(scontext);
}
freecon(scontext);
}
@@
-119,10
+118,12
@@
void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
char *media;
int ret = -1;
char *media;
int ret = -1;
- media = get_media(devname, mode);
- if (media) {
- ret = matchmediacon(media, &scontext);
- free(media);
+ if (devname) {
+ media = get_media(devname, mode);
+ if (media) {
+ ret = matchmediacon(media, &scontext);
+ free(media);
+ }
}
if (ret < 0)
}
if (ret < 0)
@@
-132,7
+133,7
@@
void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
}
if (setfscreatecon(scontext) < 0)
}
if (setfscreatecon(scontext) < 0)
- err("setfscreatecon %s failed: %s", file, strerror(errno));
+ err("setfscreatecon %s failed: %s
\n
", file, strerror(errno));
freecon(scontext);
}
freecon(scontext);
}
@@
-142,7
+143,7
@@
void selinux_resetfscreatecon(void)
{
if (is_selinux_running()) {
if (setfscreatecon(prev_scontext) < 0)
{
if (is_selinux_running()) {
if (setfscreatecon(prev_scontext) < 0)
- err("setfscreatecon failed: %s", strerror(errno));
+ err("setfscreatecon failed: %s
\n
", strerror(errno));
}
}
}
}
@@
-153,6
+154,8
@@
void selinux_init(void)
* restoration creation purposes.
*/
if (is_selinux_running()) {
* restoration creation purposes.
*/
if (is_selinux_running()) {
+ if (!udev_root[0])
+ err("selinux_init: udev_root not set\n");
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
err("getfscreatecon failed\n");
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
err("getfscreatecon failed\n");