--------------------- PatchSet 1908 Date: 2001/04/13 23:29:44 Author: hno Branch: authinfo Tag: (none) Log: Minor cleanup of the added enum names Members: src/auth/basic/auth_basic.c:1.11.16.1->1.11.16.2 src/auth/digest/auth_digest.c:1.5.22.1->1.5.22.2 Index: squid/src/auth/basic/auth_basic.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/basic/auth_basic.c,v retrieving revision 1.11.16.1 retrieving revision 1.11.16.2 diff -u -r1.11.16.1 -r1.11.16.2 --- squid/src/auth/basic/auth_basic.c 13 Apr 2001 23:17:17 -0000 1.11.16.1 +++ squid/src/auth/basic/auth_basic.c 13 Apr 2001 23:29:44 -0000 1.11.16.2 @@ -210,7 +210,7 @@ if (basic_auth->credentials_checkedtime + basicConfig->credentialsTTL <= squid_curtime) return AUTHDIR_REVALIDATE; return AUTHDIR_OK; - case CREDENTIALS_EVALUATING: /* paused while waiting for a username:password check on another request */ + case CREDENTIALS_PENDING: /* paused while waiting for a username:password check on another request */ return AUTHDIR_REVALIDATE; case CREDENTIALS_FAILED: /* authentication process failed. */ return AUTHDIR_FAILED; @@ -606,7 +606,7 @@ r->data = data; r->auth_user_request = auth_user_request; /* mark the user as haveing verification in progress */ - auth_user_request->auth_user->credentials_status = CREDENTIALS_EVALUATING; + auth_user_request->auth_user->credentials_status = CREDENTIALS_PENDING; snprintf(buf, 8192, "%s %s\n", basic_auth->username, basic_auth->passwd); helperSubmit(basicauthenticators, buf, authenticateBasicHandleReply, r); } Index: squid/src/auth/digest/auth_digest.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/digest/auth_digest.c,v retrieving revision 1.5.22.1 retrieving revision 1.5.22.2 diff -u -r1.5.22.1 -r1.5.22.2 --- squid/src/auth/digest/auth_digest.c 13 Apr 2001 23:27:14 -0000 1.5.22.1 +++ squid/src/auth/digest/auth_digest.c 13 Apr 2001 23:29:44 -0000 1.5.22.2 @@ -651,7 +651,7 @@ /* do we have the HA1 */ if (!digest_user->HA1created) { - auth_user_request->auth_user->credentials_status = CREDENTIALS_EVALUATING; + auth_user_request->auth_user->credentials_status = CREDENTIALS_PENDING; return; } if (digest_request->nonce == NULL) { @@ -704,7 +704,7 @@ /* send stale response to the client agent */ return AUTHDIR_FAILED; return AUTHDIR_OK; - case CREDENTIALS_EVALUATING: /* partway through checking. */ + case CREDENTIALS_PENDING: /* partway through checking. */ return AUTHDIR_REVALIDATE; case CREDENTIALS_FAILED: /* authentication process failed. */ default: