Skip to content

Commit eb7750c

Browse files
olehermanseolehermanse
authored
Merge pull request #3276 from olehermanse/cfps
CFE-2886: Changed cfPS to take Attributes *
2 parents 8a5d916 + 81806a1 commit eb7750c

27 files changed

+514
-513
lines changed

‎cf-agent/acl_posix.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ PromiseResult CheckPosixLinuxACL(EvalContext *ctx, const char *file_path, Acl ac
6969

7070
if (!CheckPosixLinuxAccessACEs(ctx, acl.acl_entries, acl.acl_method, file_path, a, pp, &result))
7171
{
72-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a, "Failed checking access ACL on %s", file_path);
72+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a, "Failed checking access ACL on %s", file_path);
7373
PromiseRef(LOG_LEVEL_ERR, pp);
7474
return PROMISE_RESULT_FAIL;
7575
}
@@ -79,7 +79,7 @@ PromiseResult CheckPosixLinuxACL(EvalContext *ctx, const char *file_path, Acl ac
7979
if (!CheckPosixLinuxDefaultACEs(ctx, acl.acl_default_entries, acl.acl_method, acl.acl_default,
8080
file_path, a, pp, &result))
8181
{
82-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a, "Failed checking default ACL on '%s'", file_path);
82+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a, "Failed checking default ACL on '%s'", file_path);
8383
PromiseRef(LOG_LEVEL_ERR, pp);
8484
return PROMISE_RESULT_FAIL;
8585
}
@@ -333,7 +333,7 @@ static int CheckPosixLinuxACEs(EvalContext *ctx, Rlist *aces, AclMethod method,
333333
{
334334
case cfa_warn:
335335

336-
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, a,
336+
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, &a,
337337
"%s ACL on file '%s' needs to be updated", acl_type_str, file_path);
338338
*result = PromiseResultUpdate(*result, PROMISE_RESULT_WARN);
339339
break;
@@ -375,7 +375,7 @@ static int CheckPosixLinuxACEs(EvalContext *ctx, Rlist *aces, AclMethod method,
375375
acl_free(acl_text_str);
376376
}
377377

378-
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "%s ACL on '%s' successfully changed.", acl_type_str, file_path);
378+
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, &a, "%s ACL on '%s' successfully changed.", acl_type_str, file_path);
379379
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
380380

381381
break;
@@ -387,7 +387,7 @@ static int CheckPosixLinuxACEs(EvalContext *ctx, Rlist *aces, AclMethod method,
387387
}
388388
else
389389
{
390-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a, "'%s' ACL on '%s' needs no modification.", acl_type_str, file_path);
390+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a, "'%s' ACL on '%s' needs no modification.", acl_type_str, file_path);
391391
}
392392

393393
acl_free(acl_existing);
@@ -432,7 +432,7 @@ static int CheckDefaultEqualsAccessACL(EvalContext *ctx, const char *file_path,
432432
switch (equals)
433433
{
434434
case 0: // they equal, as desired
435-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a, "Default ACL on '%s' needs no modification.", file_path);
435+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a, "Default ACL on '%s' needs no modification.", file_path);
436436
retval = true;
437437
break;
438438

@@ -442,7 +442,7 @@ static int CheckDefaultEqualsAccessACL(EvalContext *ctx, const char *file_path,
442442
{
443443
case cfa_warn:
444444

445-
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, a, "Default ACL on '%s' needs to be copied from access ACL.",
445+
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, &a, "Default ACL on '%s' needs to be copied from access ACL.",
446446
file_path);
447447
*result = PromiseResultUpdate(*result, PROMISE_RESULT_WARN);
448448
break;
@@ -463,7 +463,7 @@ static int CheckDefaultEqualsAccessACL(EvalContext *ctx, const char *file_path,
463463
}
464464
}
465465

466-
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a,
466+
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, &a,
467467
"Default ACL on '%s' successfully copied from access ACL.",
468468
file_path);
469469
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
@@ -519,7 +519,7 @@ int CheckDefaultClearACL(EvalContext *ctx, const char *file_path, Attributes a,
519519
break;
520520

521521
case 0: // no entries, as desired
522-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a, "Default ACL on '%s' needs no modification.", file_path);
522+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a, "Default ACL on '%s' needs no modification.", file_path);
523523
retval = true;
524524
break;
525525

@@ -536,7 +536,7 @@ int CheckDefaultClearACL(EvalContext *ctx, const char *file_path, Attributes a,
536536
{
537537
case cfa_warn:
538538

539-
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, a, "Default ACL on '%s' needs to be cleared", file_path);
539+
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, &a, "Default ACL on '%s' needs to be cleared", file_path);
540540
*result = PromiseResultUpdate(*result, PROMISE_RESULT_WARN);
541541
break;
542542

@@ -552,7 +552,7 @@ int CheckDefaultClearACL(EvalContext *ctx, const char *file_path, Attributes a,
552552
}
553553
}
554554

555-
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a, "Default ACL on '%s' successfully cleared", file_path);
555+
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, &a, "Default ACL on '%s' successfully cleared", file_path);
556556
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
557557
retval = true;
558558

@@ -1139,7 +1139,7 @@ static int ParseModePosixLinux(char *mode, acl_permset_t perms)
11391139

11401140
PromiseResult CheckPosixLinuxACL(EvalContext *ctx, ARG_UNUSED const char *file_path, ARG_UNUSED Acl acl, Attributes a, const Promise *pp)
11411141
{
1142-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a,
1142+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a,
11431143
"Posix ACLs are not supported on this Linux system - install the Posix acl library");
11441144
PromiseRef(LOG_LEVEL_ERR, pp);
11451145
return PROMISE_RESULT_FAIL;

‎cf-agent/files_changes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ bool FileChangesCheckAndUpdateHash(EvalContext *ctx,
530530
assert(attr != NULL);
531531
bool ret = FileChangesCheckAndUpdateHash_impl(filename, digest, type, attr->change.update, pp, result);
532532
// TODO: Move cfPS even further up the call stack.
533-
cfPS(ctx, LOG_LEVEL_DEBUG, *result, pp, *attr, "Updating promise status for files changes promise");
533+
cfPS(ctx, LOG_LEVEL_DEBUG, *result, pp, attr, "Updating promise status for files changes promise");
534534
return ret;
535535
}
536536

‎cf-agent/files_edit.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ void FinishEditContext(EvalContext *ctx, EditContext *ec, Attributes a, const Pr
108108
!CompareToFile(ctx, ec->file_start, ec->filename, a, pp, result) &&
109109
ec->num_edits > 0)
110110
{
111-
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, a,
111+
cfPS(ctx, LOG_LEVEL_WARNING, PROMISE_RESULT_WARN, pp, &a,
112112
"Should edit file '%s' but only a warning promised",
113113
ec->filename);
114114
*result = PROMISE_RESULT_WARN;
115115
}
116116
else
117117
{
118-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a,
118+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a,
119119
"No edit changes to file '%s' need saving", ec->filename);
120120
*result = PROMISE_RESULT_NOOP;
121121
}
@@ -126,18 +126,18 @@ void FinishEditContext(EvalContext *ctx, EditContext *ec, Attributes a, const Pr
126126
{
127127
if (CompareToFile(ctx, ec->file_start, ec->filename, a, pp, result))
128128
{
129-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a,
129+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a,
130130
"No edit changes to file '%s' need saving", ec->filename);
131131
}
132132
else if (SaveItemListAsFile(ec->file_start, ec->filename, a, ec->new_line_mode))
133133
{
134-
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a,
134+
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, &a,
135135
"Edit file '%s'", ec->filename);
136136
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
137137
}
138138
else
139139
{
140-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a,
140+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a,
141141
"Unable to save file '%s' after editing", ec->filename);
142142
*result = PromiseResultUpdate(*result, PROMISE_RESULT_FAIL);
143143
}
@@ -150,33 +150,33 @@ void FinishEditContext(EvalContext *ctx, EditContext *ec, Attributes a, const Pr
150150
{
151151
if (ec)
152152
{
153-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a,
153+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a,
154154
"No edit changes to xml file '%s' need saving", ec->filename);
155155
}
156156
}
157157
else if (SaveXmlDocAsFile(ec->xmldoc, ec->filename, a, ec->new_line_mode))
158158
{
159-
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, a,
159+
cfPS(ctx, LOG_LEVEL_INFO, PROMISE_RESULT_CHANGE, pp, &a,
160160
"Edited xml file '%s'", ec->filename);
161161
*result = PromiseResultUpdate(*result, PROMISE_RESULT_CHANGE);
162162
}
163163
else
164164
{
165-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a,
165+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a,
166166
"Failed to edit XML file '%s'", ec->filename);
167167
*result = PromiseResultUpdate(*result, PROMISE_RESULT_FAIL);
168168
}
169169
xmlFreeDoc(ec->xmldoc);
170170
#else
171-
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, a,
171+
cfPS(ctx, LOG_LEVEL_ERR, PROMISE_RESULT_FAIL, pp, &a,
172172
"Cannot edit XML files without LIBXML2");
173173
*result = PromiseResultUpdate(*result, PROMISE_RESULT_FAIL);
174174
#endif
175175
}
176176
}
177177
else if (ec)
178178
{
179-
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, a,
179+
cfPS(ctx, LOG_LEVEL_VERBOSE, PROMISE_RESULT_NOOP, pp, &a,
180180
"No edit changes to file '%s' need saving", ec->filename);
181181
}
182182

0 commit comments

Comments
 (0)