------------------------------------------------------------
revno: 12702
revision-id: squid3@treenet.co.nz-20161217075525-cc2lph0uqes0drek
parent: squid3@treenet.co.nz-20161217075219-jyj821gqmfjbf6b6
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3290
author: Garri Djavadyan <garryd@comnet.uz>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Sat 2016-12-17 20:55:25 +1300
message:
  Bug 3290: authenticate_ttl not working for digest authentication
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20161217075525-cc2lph0uqes0drek
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: c3baa77d027ac107180307ab14179b76934a13d4
# timestamp: 2016-12-17 07:59:19 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20161217075219-\
#   jyj821gqmfjbf6b6
# 
# Begin patch
=== modified file 'src/auth/digest/UserRequest.cc'
--- src/auth/digest/UserRequest.cc	2013-11-29 04:25:32 +0000
+++ src/auth/digest/UserRequest.cc	2016-12-17 07:55:25 +0000
@@ -162,12 +162,7 @@
     auth_user->credentials(Auth::Ok);
 
     /* password was checked and did match */
-    debugs(29, 4, HERE << "user '" << auth_user->username() << "' validated OK");
-
-    /* auth_user is now linked, we reset these values
-     * after external auth occurs anyway */
-    auth_user->expiretime = current_time.tv_sec;
-    return;
+    debugs(29, 4, "user '" << auth_user->username() << "' validated OK");
 }
 
 Auth::Direction

=== modified file 'src/auth/digest/auth_digest.cc'
--- src/auth/digest/auth_digest.cc	2014-02-20 01:20:41 +0000
+++ src/auth/digest/auth_digest.cc	2016-12-17 07:55:25 +0000
@@ -1078,6 +1078,10 @@
          * the user agent won't change user name without warning.
          */
         authDigestUserLinkNonce(digest_user, nonce);
+
+        /* auth_user is now linked, we reset these values
+         * after external auth occurs anyway */
+        auth_user->expiretime = current_time.tv_sec;
     } else {
         debugs(29, 9, HERE << "Found user '" << username << "' in the user cache as '" << auth_user << "'");
         digest_user = static_cast<Auth::Digest::User *>(auth_user.getRaw());