chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: Change path_is_mount_point() symlink arg from bool to flags
[elogind.git]
/
src
/
shared
/
condition.c
diff --git
a/src/shared/condition.c
b/src/shared/condition.c
index 0a77607eeaa1e5244d4bf6964ae97cdfbdb1630e..24871b0daedb2b3491e78aaff0f42803ad1a79cc 100644
(file)
--- a/
src/shared/condition.c
+++ b/
src/shared/condition.c
@@
-35,8
+35,9
@@
#include "ima-util.h"
#include "selinux-util.h"
#include "audit.h"
#include "ima-util.h"
#include "selinux-util.h"
#include "audit.h"
-#include "condition.h"
#include "cap-list.h"
#include "cap-list.h"
+#include "hostname-util.h"
+#include "condition.h"
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
@@
-100,7
+101,7
@@
static int condition_test_kernel_command_line(Condition *c) {
_cleanup_free_ char *word = NULL;
bool found;
_cleanup_free_ char *word = NULL;
bool found;
- r = unquote_first_word(&p, &word,
true
);
+ r = unquote_first_word(&p, &word,
UNQUOTE_RELAX
);
if (r < 0)
return r;
if (r == 0)
if (r < 0)
return r;
if (r == 0)
@@
-348,7
+349,7
@@
static int condition_test_path_is_mount_point(Condition *c) {
assert(c->parameter);
assert(c->type == CONDITION_PATH_IS_MOUNT_POINT);
assert(c->parameter);
assert(c->type == CONDITION_PATH_IS_MOUNT_POINT);
- return path_is_mount_point(c->parameter,
true
) > 0;
+ return path_is_mount_point(c->parameter,
AT_SYMLINK_FOLLOW
) > 0;
}
static int condition_test_path_is_read_write(Condition *c) {
}
static int condition_test_path_is_read_write(Condition *c) {