← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/adaptation/AccessCheck.cc

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/adaptation/AccessCheck.cc
23
23
 
24
24
    if (Config::Enabled) {
25
25
        // the new check will call the callback and delete self, eventually
26
 
        return AsyncStart(new AccessCheck(
27
 
                              ServiceFilter(method, vp, req, rep), cb, cbdata));
 
26
        AsyncJob::Start(new AccessCheck( // we do not store so not a CbcPointer
 
27
                            ServiceFilter(method, vp, req, rep), cb, cbdata));
 
28
        return true;
28
29
    }
29
30
 
30
31
    debugs(83, 3, HERE << "adaptation off, skipping");
123
124
     * we should be kicking off an authentication before continuing
124
125
     * with this request. see bug 2400 for details.
125
126
     */
126
 
    ac->noteAnswer(answer==ACCESS_ALLOWED);
 
127
 
 
128
    // convert to async call to get async call protections and features
 
129
    typedef UnaryMemFunT<AccessCheck, int> MyDialer;
 
130
    AsyncCall::Pointer call =
 
131
        asyncCall(93,7, "Adaptation::AccessCheck::noteAnswer",
 
132
                  MyDialer(ac, &Adaptation::AccessCheck::noteAnswer,
 
133
                           answer==ACCESS_ALLOWED));
 
134
    ScheduleCallHere(call);
 
135
 
127
136
}
128
137
 
129
138
/// process the results of the ACL check