Security-58286.41.2.tar.gz

[apple/security.git] / OSX / libsecurity_cdsa_utilities / lib / acl_threshold.cpp

diff --git a/OSX/libsecurity_cdsa_utilities/lib/acl_threshold.cpp b/OSX/libsecurity_cdsa_utilities/lib/acl_threshold.cpp
index 17e568f91165dd6e06c078f1685d441437d74008..7cccfa6d271a14cf3e0b3ce8341f960403509f64 100644 (file)
--- a/OSX/libsecurity_cdsa_utilities/lib/acl_threshold.cpp
+++ b/OSX/libsecurity_cdsa_utilities/lib/acl_threshold.cpp
@@ -53,7 +53,7 @@ public:
     const TypedList &sampleList;
 };
 
     const TypedList &sampleList;
 };
 

-bool ThresholdAclSubject::validate(const AclValidationContext &baseCtx,
+bool ThresholdAclSubject::validates(const AclValidationContext &baseCtx,

     const TypedList &sample) const
 {
 #ifdef STRICTCOUNTING
     const TypedList &sample) const
 {
 #ifdef STRICTCOUNTING


@@ -71,7 +71,7 @@ bool ThresholdAclSubject::validate(const AclValidationContext &baseCtx,
     SublistValidationContext ctx(baseCtx, sample);
     uint32 matched = 0;
     for (uint32 n = 0; n < totalSubjects; n++) {
     SublistValidationContext ctx(baseCtx, sample);
     uint32 matched = 0;
     for (uint32 n = 0; n < totalSubjects; n++) {

-               if ((matched += elements[n]->validate(ctx)) >= minimumNeeded)
+               if ((matched += elements[n]->validates(ctx)) >= minimumNeeded)

             return true;
 #ifdef STRICTCOUNTING
         else if (matched + subSampleCount - n <= minimumNeeded)
             return true;
 #ifdef STRICTCOUNTING
         else if (matched + subSampleCount - n <= minimumNeeded)


@@ -156,7 +156,7 @@ void ThresholdAclSubject::exportBlob(Writer &pub, Writer &priv)
 
 void ThresholdAclSubject::add(AclSubject *subject, unsigned beforePosition)
 {
 
 void ThresholdAclSubject::add(AclSubject *subject, unsigned beforePosition)
 {

-       secdebug("threshacl", "adding subject %p before position %u",
+       secinfo("threshacl", "adding subject %p before position %u",

                subject, beforePosition);
        elements.insert(elements.begin() + beforePosition, subject);
        totalSubjects++;
                subject, beforePosition);
        elements.insert(elements.begin() + beforePosition, subject);
        totalSubjects++;