src/patches/squid/squid-3.5-14118.patch

   1 ------------------------------------------------------------
   2 revno: 14118
   3 revision-id: squid3@treenet.co.nz-20161130233304-lk3q0bx8gn5l3l85
   4 parent: squid3@treenet.co.nz-20161130232039-z18ikhhcf3j185my
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3290
   6 author: Garri Djavadyan <garryd@comnet.uz>
   7 committer: Amos Jeffries <squid3@treenet.co.nz>
   8 branch nick: 3.5
   9 timestamp: Thu 2016-12-01 12:33:04 +1300
  10 message:
  11   Bug 3290: authenticate_ttl not working for digest authentication
  12 ------------------------------------------------------------
  13 # Bazaar merge directive format 2 (Bazaar 0.90)
  14 # revision_id: squid3@treenet.co.nz-20161130233304-lk3q0bx8gn5l3l85
  15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  16 # testament_sha1: 50ff391db1484222ead5fb50b1bca0694c37ed4c
  17 # timestamp: 2016-11-30 23:34:59 +0000
  18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  19 # base_revision_id: squid3@treenet.co.nz-20161130232039-\
  20 #   z18ikhhcf3j185my
  21 #
  22 # Begin patch
  23 === modified file 'src/auth/digest/Config.cc'
  24 --- src/auth/digest/Config.cc   2016-11-14 10:54:34 +0000
  25 +++ src/auth/digest/Config.cc   2016-11-30 23:33:04 +0000
  26 @@ -1058,6 +1058,10 @@
  27           * the user agent won't change user name without warning.
  28           */
  29          authDigestUserLinkNonce(digest_user, nonce);
  30 +
  31 +        /* auth_user is now linked, we reset these values
  32 +         * after external auth occurs anyway */
  33 +        auth_user->expiretime = current_time.tv_sec;
  34      } else {
  35          debugs(29, 9, "Found user '" << username << "' in the user cache as '" << auth_user << "'");
  36          digest_user = static_cast<Auth::Digest::User *>(auth_user.getRaw());
  37
  38 === modified file 'src/auth/digest/UserRequest.cc'
  39 --- src/auth/digest/UserRequest.cc      2016-01-01 00:14:27 +0000
  40 +++ src/auth/digest/UserRequest.cc      2016-11-30 23:33:04 +0000
  41 @@ -187,12 +187,7 @@
  42      auth_user->credentials(Auth::Ok);
  43
  44      /* password was checked and did match */
  45 -    debugs(29, 4, HERE << "user '" << auth_user->username() << "' validated OK");
  46 -
  47 -    /* auth_user is now linked, we reset these values
  48 -     * after external auth occurs anyway */
  49 -    auth_user->expiretime = current_time.tv_sec;
  50 -    return;
  51 +    debugs(29, 4, "user '" << auth_user->username() << "' validated OK");
  52  }
  53
  54  Auth::Direction
  55