--------------------- PatchSet 1179 Date: 2001/01/07 20:43:02 Author: hno Branch: auth_rewrite Tag: (none) Log: indent Members: src/acl.c:1.1.1.3.12.26.2.26->1.1.1.3.12.26.2.27 src/auth/ntlm/auth_ntlm.c:1.1.2.19->1.1.2.20 Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.1.1.3.12.26.2.26 retrieving revision 1.1.1.3.12.26.2.27 diff -u -r1.1.1.3.12.26.2.26 -r1.1.1.3.12.26.2.27 --- squid/src/acl.c 7 Jan 2001 20:19:59 -0000 1.1.1.3.12.26.2.26 +++ squid/src/acl.c 7 Jan 2001 20:43:02 -0000 1.1.1.3.12.26.2.27 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.1.1.3.12.26.2.26 2001/01/07 20:19:59 hno Exp $ + * $Id: acl.c,v 1.1.1.3.12.26.2.27 2001/01/07 20:43:02 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1071,17 +1071,17 @@ if (user == NULL) return 0; if (data->flags.case_insensitive) - Tolower(user); + Tolower(user); if (data->flags.required) { - debug(28, 7) ("aclMatchUser: user REQUIRED and auth-info present.\n"); - return 1; + debug(28, 7) ("aclMatchUser: user REQUIRED and auth-info present.\n"); + return 1; } Top = splay_splay(user, Top, (SPLAYCMP *) strcmp); /* Top=splay_splay(user,Top,(SPLAYCMP *)dumping_strcmp); */ debug(28, 7) ("aclMatchUser: returning %d,Top is %p, Top->data is %s\n", - !splayLastResult, - Top, (Top ? Top->data : "Unavailable")); + !splayLastResult, + Top, (Top ? Top->data : "Unavailable")); data->names = Top; return !splayLastResult; } Index: squid/src/auth/ntlm/auth_ntlm.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -u -r1.1.2.19 -r1.1.2.20 --- squid/src/auth/ntlm/auth_ntlm.c 7 Jan 2001 12:56:08 -0000 1.1.2.19 +++ squid/src/auth/ntlm/auth_ntlm.c 7 Jan 2001 20:43:02 -0000 1.1.2.20 @@ -998,7 +998,8 @@ //user passed externa; authentication in every case to get here. f. Let it through } /* we don't unlock the auth_user until the connection is dropped. Thank - * MS for this quirk. */ if (authenticateCheckAuthUserIP(checklist->src_addr, auth_user)) { + * MS for this quirk. */ + if (authenticateCheckAuthUserIP(checklist->src_addr, auth_user)) { /* Once the match is completed we have finished with the * auth_user structure */ /* check to see if we have matched the user-acl before */