chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: fix linux_raid metadata version 1.0 detection
[elogind.git]
/
udev_selinux.c
diff --git
a/udev_selinux.c
b/udev_selinux.c
index a305e241367e18dc1fafaeebc5765e0fe4c58eeb..1ad6e8ad122f51985601cbfc80ab0ada61120cce 100644
(file)
--- a/
udev_selinux.c
+++ b/
udev_selinux.c
@@
-75,7
+75,7
@@
static char *get_media(const char *devname, int mode)
}
media = strdup(mediabuf);
}
media = strdup(mediabuf);
- info("selinux_get_media(%s)='%s'
\n
", devname, media);
+ info("selinux_get_media(%s)='%s'", devname, media);
close_out:
fclose(fp);
close_out:
fclose(fp);
@@
-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);
@@
-101,7
+100,7
@@
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) {
- err("matchpathcon(%s) failed
\n
", file);
+ err("matchpathcon(%s) failed", file);
return;
}
return;
}
@@
-119,15
+118,17
@@
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 (matchpathcon(file, mode, &scontext) < 0) {
}
if (ret < 0)
if (matchpathcon(file, mode, &scontext) < 0) {
- err("matchpathcon(%s) failed
\n
", file);
+ err("matchpathcon(%s) failed", file);
return;
}
return;
}
@@
-153,9
+154,11
@@
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");
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
- err("getfscreatecon failed
\n
");
+ err("getfscreatecon failed");
prev_scontext = NULL;
}
}
prev_scontext = NULL;
}
}