--------------------- PatchSet 10585 Date: 2008/06/02 15:47:46 Author: serassio Branch: nt Tag: (none) Log: Ran indent Members: helpers/basic_auth/squid_radius_auth/squid_rad_auth.c:1.1.2.9->1.1.2.10 src/dnsserver.c:1.6.26.2->1.6.26.3 tools/squidclient.c:1.2.4.7->1.2.4.8 Index: squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.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/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c 2 Jun 2008 13:18:23 -0000 1.1.2.9 +++ squid/helpers/basic_auth/squid_radius_auth/squid_rad_auth.c 2 Jun 2008 15:47:46 -0000 1.1.2.10 @@ -192,12 +192,10 @@ totallen, length); return -1; } - if (auth->id != request_id) { /* Duplicate response of an earlier query, ignore */ return -1; } - /* Verify the reply digest */ memcpy(reply_digest, auth->vector, AUTH_VECTOR_LEN); memcpy(auth->vector, vector, AUTH_VECTOR_LEN); @@ -209,7 +207,6 @@ fprintf(stderr, "Warning: Received invalid reply digest from server\n"); return -1; } - if (auth->code != PW_AUTHENTICATION_ACK) return 1; @@ -260,9 +257,9 @@ crt = sscanf(line, "secret %s", secretkey); if (!memcmp(line, "identifier", 10)) sscanf(line, "identifier %s", identifier); - if (!memcmp(line, "service", 7)) + if (!memcmp(line, "service", 7)) sscanf(line, "service %s", svc_name); - if (!memcmp(line, "port", 4)) + if (!memcmp(line, "port", 4)) sscanf(line, "port %s", svc_name); } if (srv && crt) @@ -356,7 +353,7 @@ memcpy(cbc, auth->vector, AUTH_VECTOR_LEN); for (j = 0; j < length; j += AUTH_VECTOR_LEN) { /* Calculate the MD5 Digest */ - strcpy((char *)md5buf, secretkey); + strcpy((char *) md5buf, secretkey); memcpy(md5buf + secretlen, cbc, AUTH_VECTOR_LEN); md5_calc(cbc, md5buf, secretlen + AUTH_VECTOR_LEN); @@ -409,7 +406,7 @@ */ auth->length = htons(total_length); - while(retry--) { + while (retry--) { int time_spent; struct timeval sent; /* @@ -442,7 +439,7 @@ if (rc == 0) return 1; if (rc == 1) - return 0; + return 0; } } @@ -468,7 +465,7 @@ int c; while ((c = getopt(argc, argv, "h:p:f:w:i:t:")) != -1) { - switch(c) { + switch (c) { case 'f': cfname = optarg; break; @@ -499,22 +496,19 @@ exit(1); } } - if (!*server) { fprintf(stderr, "%s: Server not specified\n", argv[0]); exit(1); } - if (!*secretkey) { fprintf(stderr, "%s: Shared secret not specified\n", argv[0]); exit(1); } - #ifdef _SQUID_MSWIN_ { WSADATA wsaData; WSAStartup(2, &wsaData); - atexit(Win32SockCleanup); + atexit(Win32SockCleanup); } #endif /* Index: squid/src/dnsserver.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/dnsserver.c,v retrieving revision 1.6.26.2 retrieving revision 1.6.26.3 diff -u -r1.6.26.2 -r1.6.26.3 --- squid/src/dnsserver.c 2 Jun 2008 13:18:23 -0000 1.6.26.2 +++ squid/src/dnsserver.c 2 Jun 2008 15:47:46 -0000 1.6.26.3 @@ -1,6 +1,6 @@ /* - * $Id: dnsserver.c,v 1.6.26.2 2008/06/02 13:18:23 serassio Exp $ + * $Id: dnsserver.c,v 1.6.26.3 2008/06/02 15:47:46 serassio Exp $ * * DEBUG: section 0 DNS Resolver * AUTHOR: Harvest Derived @@ -346,12 +346,12 @@ #endif for (;;) { memset(request, '\0', REQ_SZ); - if (fgets(request, REQ_SZ, stdin) == NULL) { + if (fgets(request, REQ_SZ, stdin) == NULL) { #ifdef _SQUID_MSWIN_ - WSACleanup(); + WSACleanup(); #endif exit(1); - } + } t = strrchr(request, '\n'); if (t == NULL) /* Ignore if no newline */ continue; Index: squid/tools/squidclient.c =================================================================== RCS file: /cvsroot/squid-sf//squid/tools/squidclient.c,v retrieving revision 1.2.4.7 retrieving revision 1.2.4.8 diff -u -r1.2.4.7 -r1.2.4.8 --- squid/tools/squidclient.c 2 Jun 2008 13:18:24 -0000 1.2.4.7 +++ squid/tools/squidclient.c 2 Jun 2008 15:47:47 -0000 1.2.4.8 @@ -1,6 +1,6 @@ /* - * $Id: squidclient.c,v 1.2.4.7 2008/06/02 13:18:24 serassio Exp $ + * $Id: squidclient.c,v 1.2.4.8 2008/06/02 15:47:47 serassio Exp $ * * DEBUG: section 0 WWW Client * AUTHOR: Harvest Derived @@ -304,7 +304,7 @@ { WSADATA wsaData; WSAStartup(2, &wsaData); - atexit(Win32SockCleanup); + atexit(Win32SockCleanup); } #endif /* Build the HTTP request */