--------------------- PatchSet 7755 Date: 2006/05/15 12:07:36 Author: hno Branch: negotiate-2_5 Tag: (none) Log: Indent Members: src/authenticate.c:1.23.2.13.2.3->1.23.2.13.2.4 src/auth/negotiate/auth_negotiate.c:1.1.2.9->1.1.2.10 src/auth/ntlm/auth_ntlm.c:1.18.2.14.2.10->1.18.2.14.2.11 Index: squid/src/authenticate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v retrieving revision 1.23.2.13.2.3 retrieving revision 1.23.2.13.2.4 diff -u -r1.23.2.13.2.3 -r1.23.2.13.2.4 --- squid/src/authenticate.c 24 Sep 2005 22:52:59 -0000 1.23.2.13.2.3 +++ squid/src/authenticate.c 15 May 2006 12:07:36 -0000 1.23.2.13.2.4 @@ -1,6 +1,6 @@ /* - * $Id: authenticate.c,v 1.23.2.13.2.3 2005/09/24 22:52:59 hno Exp $ + * $Id: authenticate.c,v 1.23.2.13.2.4 2006/05/15 12:07:36 hno Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -764,12 +764,12 @@ for (i = 0; i < Config.authConfig.n_configured; i++) { scheme = Config.authConfig.schemes + i; if (authscheme_list[scheme->Id].Active()) { - if (auth_user_request && scheme->Id == auth_user_request->auth_user->auth_module - 1) + if (auth_user_request && scheme->Id == auth_user_request->auth_user->auth_module - 1) authscheme_list[scheme->Id].authFixHeader( - auth_user_request, rep, type, request); + auth_user_request, rep, type, request); else authscheme_list[scheme->Id].authFixHeader( - NULL, rep, type, request); + NULL, rep, type, request); } else { debug(29, 4) ("authenticateFixHeader: Configured scheme %s not Active\n", scheme->typestr); } Index: squid/src/auth/negotiate/auth_negotiate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/negotiate/auth_negotiate.c,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- squid/src/auth/negotiate/auth_negotiate.c 6 Nov 2005 22:16:01 -0000 1.1.2.9 +++ squid/src/auth/negotiate/auth_negotiate.c 15 May 2006 12:07:36 -0000 1.1.2.10 @@ -1,6 +1,6 @@ /* - * $Id: auth_negotiate.c,v 1.1.2.9 2005/11/06 22:16:01 hno Exp $ + * $Id: auth_negotiate.c,v 1.1.2.10 2006/05/15 12:07:36 hno Exp $ * * DEBUG: section 29 Negotiate Authenticator * AUTHOR: Robert Collins @@ -270,12 +270,12 @@ negotiate_request_t *negotiate_request = auth_user_request->scheme_data; /* null auth_user is checked for by authenticateDirection */ if (negotiate_request->waiting || negotiate_request->client_blob) - return -1; /* Need helper response to continue */ + return -1; /* Need helper response to continue */ switch (negotiate_request->auth_state) { case AUTHENTICATE_STATE_NONE: /* no progress at all. */ debug(29, 1) ("authenticateNegotiateDirection: called before Negotiate Authenticate!. Report a bug to squid-dev. au %p\n", auth_user_request); return -2; - case AUTHENTICATE_STATE_NEGOTIATE: /* send to client */ + case AUTHENTICATE_STATE_NEGOTIATE: /* send to client */ assert(negotiate_request->server_blob); return 1; case AUTHENTICATE_STATE_FAILED: @@ -432,9 +432,8 @@ } if (!reply) { debug(29, 1) ("AuthenticateNegotiateHandleReply: Helper '%p' crashed!.\n", srv); - reply = (char *)"BH Internal error"; + reply = (char *) "BH Internal error"; } - auth_user_request = r->auth_user_request; negotiate_request = auth_user_request->scheme_data; @@ -462,7 +461,7 @@ } else { arg = NULL; } - + if (strncasecmp(reply, "TT ", 3) == 0) { /* we have been given a blob to send to the client */ if (arg) @@ -552,7 +551,6 @@ handler(data, NULL); return; } - /* Send blob to helper */ r = cbdataAlloc(authenticateStateData); r->handler = handler; @@ -677,7 +675,6 @@ debug(29, 2) ("authenticateNegotiateAuthenticateUser: need to challenge client '%s'!\n", negotiate_request->server_blob); return; } - /* get header */ proxy_auth = httpHeaderGetStr(&request->header, type); blob = proxy_auth; Index: squid/src/auth/ntlm/auth_ntlm.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/auth/ntlm/auth_ntlm.c,v retrieving revision 1.18.2.14.2.10 retrieving revision 1.18.2.14.2.11 diff -u -r1.18.2.14.2.10 -r1.18.2.14.2.11 --- squid/src/auth/ntlm/auth_ntlm.c 6 Nov 2005 22:16:02 -0000 1.18.2.14.2.10 +++ squid/src/auth/ntlm/auth_ntlm.c 15 May 2006 12:07:36 -0000 1.18.2.14.2.11 @@ -270,12 +270,12 @@ ntlm_request_t *ntlm_request = auth_user_request->scheme_data; /* null auth_user is checked for by authenticateDirection */ if (ntlm_request->waiting || ntlm_request->client_blob) - return -1; /* Need helper response to continue */ + return -1; /* Need helper response to continue */ switch (ntlm_request->auth_state) { case AUTHENTICATE_STATE_NONE: /* no progress at all. */ debug(29, 1) ("authenticateNTLMDirection: called before NTLM Authenticate!. Report a bug to squid-dev. au %p\n", auth_user_request); return -2; - case AUTHENTICATE_STATE_NEGOTIATE: /* send to client */ + case AUTHENTICATE_STATE_NEGOTIATE: /* send to client */ assert(ntlm_request->server_blob); return 1; case AUTHENTICATE_STATE_FAILED: @@ -408,9 +408,8 @@ } if (!reply) { debug(29, 1) ("AuthenticateNTLMHandleReply: Helper '%p' crashed!.\n", srv); - reply = (char *)"BH Internal error"; + reply = (char *) "BH Internal error"; } - auth_user_request = r->auth_user_request; ntlm_request = auth_user_request->scheme_data; @@ -435,7 +434,6 @@ if (blob) { blob++; } - if (strncasecmp(reply, "TT ", 3) == 0) { /* we have been given a blob to send to the client */ safe_free(ntlm_request->server_blob); @@ -515,7 +513,6 @@ handler(data, NULL); return; } - /* Send blob to helper */ r = cbdataAlloc(authenticateStateData); r->handler = handler; @@ -644,7 +641,6 @@ debug(29, 2) ("authenticateNTLMAuthenticateUser: need to challenge client '%s'!\n", ntlm_request->server_blob); return; } - /* get header */ proxy_auth = httpHeaderGetStr(&request->header, type); blob = proxy_auth;