chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkdir: append _label to all mkdir() calls that explicitly set the selinux context
[elogind.git]
/
src
/
shared
/
mkdir.c
diff --git
a/src/shared/mkdir.c
b/src/shared/mkdir.c
index fef674c1b39eaf78a5336dad8f3f824c59d7911e..0eb70f268efdad8ccd56e9b0b3daa8cace5f89e4 100644
(file)
--- a/
src/shared/mkdir.c
+++ b/
src/shared/mkdir.c
@@
-31,7
+31,11
@@
#include "util.h"
#include "log.h"
#include "util.h"
#include "log.h"
-int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
+int mkdir_label(const char *path, mode_t mode) {
+ return label_mkdir(path, mode);
+}
+
+int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
struct stat st;
if (label_mkdir(path, mode) >= 0)
struct stat st;
if (label_mkdir(path, mode) >= 0)
@@
-52,7
+56,7
@@
int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
return 0;
}
return 0;
}
-int mkdir_parents(const char *path, mode_t mode) {
+int mkdir_parents
_label
(const char *path, mode_t mode) {
struct stat st;
const char *p, *e;
struct stat st;
const char *p, *e;
@@
-84,22
+88,24
@@
int mkdir_parents(const char *path, mode_t mode) {
if (*p == 0)
return 0;
if (*p == 0)
return 0;
- if (!(t = strndupa(path, e - path)))
+ t = strndup(path, e - path);
+ if (!t)
return -ENOMEM;
r = label_mkdir(t, mode);
return -ENOMEM;
r = label_mkdir(t, mode);
+ free(t);
if (r < 0 && errno != EEXIST)
return -errno;
}
}
if (r < 0 && errno != EEXIST)
return -errno;
}
}
-int mkdir_p(const char *path, mode_t mode) {
+int mkdir_p
_label
(const char *path, mode_t mode) {
int r;
/* Like mkdir -p */
int r;
/* Like mkdir -p */
- if ((r = mkdir_parents(path, mode)) < 0)
+ if ((r = mkdir_parents
_label
(path, mode)) < 0)
return r;
if (label_mkdir(path, mode) < 0 && errno != EEXIST)
return r;
if (label_mkdir(path, mode) < 0 && errno != EEXIST)