Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.18 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.19 *** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.18 Sat Feb 5 03:53:07 2005 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c Sun Feb 20 12:07:44 2005 *************** *** 273,279 **** static int validUsername(const char *user) { ! const unsigned char *p = user; /* Leading whitespace? */ if (isspace(p[0])) --- 273,279 ---- static int validUsername(const char *user) { ! const unsigned char *p = (const unsigned char *)user; /* Leading whitespace? */ if (isspace(p[0])) Index: squid/helpers/basic_auth/winbind/wbntlm.h diff -c squid/helpers/basic_auth/winbind/wbntlm.h:1.1.2.2 squid/helpers/basic_auth/winbind/wbntlm.h:1.1.2.3 *** squid/helpers/basic_auth/winbind/wbntlm.h:1.1.2.2 Sat Jul 20 05:26:55 2002 --- squid/helpers/basic_auth/winbind/wbntlm.h Sun Feb 20 12:07:44 2005 *************** *** 37,43 **** /* Debugging stuff */ extern char *myname; ! static char *__foo; extern pid_t mypid; extern char debug_enabled; --- 37,43 ---- /* Debugging stuff */ extern char *myname; ! static const char *__foo; extern pid_t mypid; extern char debug_enabled; Index: squid/helpers/ntlm_auth/SMB/libntlmssp.c diff -c squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.2 squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.3 *** squid/helpers/ntlm_auth/SMB/libntlmssp.c:1.7.2.2 Fri Jun 11 10:07:55 2004 --- squid/helpers/ntlm_auth/SMB/libntlmssp.c Sun Feb 20 12:07:44 2005 *************** *** 72,79 **** #define ENCODED_PASS_LEN 24 ! static char challenge[NONCE_LEN]; ! static char lmencoded_empty_pass[ENCODED_PASS_LEN], ntencoded_empty_pass[ENCODED_PASS_LEN]; SMB_Handle_Type handle = NULL; --- 72,79 ---- #define ENCODED_PASS_LEN 24 ! static unsigned char challenge[NONCE_LEN]; ! static unsigned char lmencoded_empty_pass[ENCODED_PASS_LEN], ntencoded_empty_pass[ENCODED_PASS_LEN]; SMB_Handle_Type handle = NULL; *************** *** 139,146 **** return 3; } memcpy(challenge, handle->Encrypt_Key, NONCE_LEN); ! SMBencrypt("",challenge,lmencoded_empty_pass); ! SMBNTencrypt("",challenge,ntencoded_empty_pass); return 0; } --- 139,146 ---- return 3; } memcpy(challenge, handle->Encrypt_Key, NONCE_LEN); ! SMBencrypt((unsigned char *)"",challenge,lmencoded_empty_pass); ! SMBNTencrypt((unsigned char *)"",challenge,ntencoded_empty_pass); return 0; } Index: squid/helpers/ntlm_auth/SMB/ntlm.h diff -c squid/helpers/ntlm_auth/SMB/ntlm.h:1.7 squid/helpers/ntlm_auth/SMB/ntlm.h:1.7.2.1 *** squid/helpers/ntlm_auth/SMB/ntlm.h:1.7 Wed Nov 28 01:01:59 2001 --- squid/helpers/ntlm_auth/SMB/ntlm.h Sun Feb 20 12:07:44 2005 *************** *** 50,56 **** #ifdef DEBUG #include #include ! static char *__foo; extern char debug_enabled; #define debug(X...) if (debug_enabled) { \ fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \ --- 50,56 ---- #ifdef DEBUG #include #include ! static const char *__foo; extern char debug_enabled; #define debug(X...) if (debug_enabled) { \ fprintf(stderr,"ntlm-auth[%d](%s:%d): ", getpid(), \ Index: squid/helpers/ntlm_auth/SMB/smbval/smblib-priv.h diff -c squid/helpers/ntlm_auth/SMB/smbval/smblib-priv.h:1.2 squid/helpers/ntlm_auth/SMB/smbval/smblib-priv.h:1.2.2.1 *** squid/helpers/ntlm_auth/SMB/smbval/smblib-priv.h:1.2 Fri Mar 9 17:55:38 2001 --- squid/helpers/ntlm_auth/SMB/smbval/smblib-priv.h Sun Feb 20 12:07:44 2005 *************** *** 497,503 **** /* The following two arrays need to be in step! */ /* We must make it possible for callers to specify these ... */ ! extern char *SMB_Prots[]; /* --- 497,503 ---- /* The following two arrays need to be in step! */ /* We must make it possible for callers to specify these ... */ ! #if 0 extern char *SMB_Prots[]; /* *************** *** 532,537 **** --- 532,539 ---- * SMB_P_NT1, * -1}; */ + #endif + typedef struct SMB_Status { union { Index: squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c diff -c squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.7 squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.8 *** squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.7 Fri Sep 12 04:11:25 2003 --- squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c Sun Feb 20 12:07:45 2005 *************** *** 137,143 **** } static unsigned char challenge[CHALLENGE_LEN + 1]; ! static char * build_challenge(void) { size_t gotchars; --- 137,143 ---- } static unsigned char challenge[CHALLENGE_LEN + 1]; ! static unsigned char * build_challenge(void) { size_t gotchars; Index: squid/helpers/ntlm_auth/winbind/wbntlm.h diff -c squid/helpers/ntlm_auth/winbind/wbntlm.h:1.1.2.1 squid/helpers/ntlm_auth/winbind/wbntlm.h:1.1.2.2 *** squid/helpers/ntlm_auth/winbind/wbntlm.h:1.1.2.1 Sun May 19 17:45:31 2002 --- squid/helpers/ntlm_auth/winbind/wbntlm.h Sun Feb 20 12:07:45 2005 *************** *** 37,43 **** /* Debugging stuff */ extern char *myname; ! static char *__foo; extern pid_t mypid; extern char debug_enabled; --- 37,43 ---- /* Debugging stuff */ extern char *myname; ! static const char *__foo; extern pid_t mypid; extern char debug_enabled; Index: squid/include/ntlmauth.h diff -c squid/include/ntlmauth.h:1.8.2.1 squid/include/ntlmauth.h:1.8.2.2 *** squid/include/ntlmauth.h:1.8.2.1 Mon May 12 12:48:07 2003 --- squid/include/ntlmauth.h Sun Feb 20 12:07:45 2005 *************** *** 173,179 **** } ntlm_authenticate; const char *ntlm_make_challenge(char *domain, char *domain_controller, ! char *challenge_nonce, int challenge_nonce_len); lstring ntlm_fetch_string(char *packet, int32_t length, strhdr * str); void ntlm_add_to_payload(char *payload, int *payload_length, strhdr * hdr, char *toadd, --- 173,179 ---- } ntlm_authenticate; const char *ntlm_make_challenge(char *domain, char *domain_controller, ! unsigned char *challenge_nonce, int challenge_nonce_len); lstring ntlm_fetch_string(char *packet, int32_t length, strhdr * str); void ntlm_add_to_payload(char *payload, int *payload_length, strhdr * hdr, char *toadd, Index: squid/lib/GNUregex.c diff -c squid/lib/GNUregex.c:1.12.2.1 squid/lib/GNUregex.c:1.12.2.2 *** squid/lib/GNUregex.c:1.12.2.1 Thu Jun 19 18:09:06 2003 --- squid/lib/GNUregex.c Sun Feb 20 12:07:45 2005 *************** *** 3663,3669 **** /* Compare that many; failure if mismatch, else move * past them. */ if (translate ! ? bcmp_translate(d, d2, mcnt, translate) : memcmp(d, d2, mcnt)) goto fail; d += mcnt, d2 += mcnt; --- 3663,3669 ---- /* Compare that many; failure if mismatch, else move * past them. */ if (translate ! ? bcmp_translate((unsigned char *)d, (unsigned char *)d2, mcnt, translate) : memcmp(d, d2, mcnt)) goto fail; d += mcnt, d2 += mcnt; Index: squid/lib/ntlmauth.c diff -c squid/lib/ntlmauth.c:1.5.2.3 squid/lib/ntlmauth.c:1.5.2.4 *** squid/lib/ntlmauth.c:1.5.2.3 Fri Aug 20 02:09:58 2004 --- squid/lib/ntlmauth.c Sun Feb 20 12:07:45 2005 *************** *** 123,129 **** */ const char * ntlm_make_challenge(char *domain, char *domain_controller, ! char *challenge_nonce, int challenge_nonce_len) { ntlm_challenge ch; int pl = 0; --- 123,129 ---- */ const char * ntlm_make_challenge(char *domain, char *domain_controller, ! unsigned char *challenge_nonce, int challenge_nonce_len) { ntlm_challenge ch; int pl = 0; Index: squid/src/acl.c diff -c squid/src/acl.c:1.270.2.33 squid/src/acl.c:1.270.2.34 *** squid/src/acl.c:1.270.2.33 Sun Feb 13 11:03:20 2005 --- squid/src/acl.c Sun Feb 20 12:07:45 2005 *************** *** 2856,2862 **** #if defined(_SQUID_LINUX_) struct arpreq arpReq; struct sockaddr_in ipAddr; ! unsigned char ifbuffer[sizeof(struct ifreq) * 64]; struct ifconf ifc; struct ifreq *ifr; int offset; --- 2856,2862 ---- #if defined(_SQUID_LINUX_) struct arpreq arpReq; struct sockaddr_in ipAddr; ! char ifbuffer[sizeof(struct ifreq) * 64]; struct ifconf ifc; struct ifreq *ifr; int offset; Index: squid/src/client_side.c diff -c squid/src/client_side.c:1.561.2.70 squid/src/client_side.c:1.561.2.71 *** squid/src/client_side.c:1.561.2.70 Thu Feb 3 17:10:09 2005 --- squid/src/client_side.c Sun Feb 20 12:07:45 2005 *************** *** 3016,3022 **** /* Process next request */ while (conn->in.offset> 0 && conn->body.size_left == 0) { int nrequests; ! size_t req_line_sz; /* Skip leading (and trailing) whitespace */ while (conn->in.offset> 0 && xisspace(conn->in.buf[0])) { xmemmove(conn->in.buf, conn->in.buf + 1, conn->in.offset - 1); --- 3016,3022 ---- /* Process next request */ while (conn->in.offset> 0 && conn->body.size_left == 0) { int nrequests; ! size_t req_line_sz = 0; /* Skip leading (and trailing) whitespace */ while (conn->in.offset> 0 && xisspace(conn->in.buf[0])) { xmemmove(conn->in.buf, conn->in.buf + 1, conn->in.offset - 1); Index: squid/src/htcp.c diff -c squid/src/htcp.c:1.38.2.4 squid/src/htcp.c:1.38.2.5 *** squid/src/htcp.c:1.38.2.4 Wed Aug 6 07:49:01 2003 --- squid/src/htcp.c Sun Feb 20 12:07:45 2005 *************** *** 832,838 **** static char buf[8192]; int len; static struct sockaddr_in from; ! int flen = sizeof(struct sockaddr_in); memset(&from, '0円', flen); statCounter.syscalls.sock.recvfroms++; len = recvfrom(fd, buf, 8192, 0, (struct sockaddr *) &from, &flen); --- 832,838 ---- static char buf[8192]; int len; static struct sockaddr_in from; ! socklen_t flen = sizeof(struct sockaddr_in); memset(&from, '0円', flen); statCounter.syscalls.sock.recvfroms++; len = recvfrom(fd, buf, 8192, 0, (struct sockaddr *) &from, &flen); Index: squid/src/main.c diff -c squid/src/main.c:1.345.2.17 squid/src/main.c:1.345.2.18 *** squid/src/main.c:1.345.2.17 Sun Feb 13 14:19:44 2005 --- squid/src/main.c Sun Feb 20 12:07:45 2005 *************** *** 807,813 **** xstrncpy(&script[sl], squid_start_script, MAXPATHLEN - sl); if ((cpid = fork()) == 0) { /* child */ ! execl(script, squid_start_script, 0); _exit(0); } else { do { --- 807,813 ---- xstrncpy(&script[sl], squid_start_script, MAXPATHLEN - sl); if ((cpid = fork()) == 0) { /* child */ ! execl(script, squid_start_script, NULL); _exit(0); } else { do { Index: squid/src/wccp.c diff -c squid/src/wccp.c:1.19.2.9 squid/src/wccp.c:1.19.2.10 *** squid/src/wccp.c:1.19.2.9 Fri Feb 4 04:38:15 2005 --- squid/src/wccp.c Sun Feb 20 12:07:45 2005 *************** *** 123,129 **** { u_short port = WCCP_PORT; struct sockaddr_in router, local; ! int local_len, router_len; debug(80, 5) ("wccpConnectionOpen: Called\n"); if (Config.Wccp.router.s_addr == any_addr.s_addr) { debug(1, 1) ("WCCP Disabled.\n"); --- 123,129 ---- { u_short port = WCCP_PORT; struct sockaddr_in router, local; ! socklen_t local_len, router_len; debug(80, 5) ("wccpConnectionOpen: Called\n"); if (Config.Wccp.router.s_addr == any_addr.s_addr) { debug(1, 1) ("WCCP Disabled.\n"); Index: squid/src/auth/ntlm/auth_ntlm.h diff -c squid/src/auth/ntlm/auth_ntlm.h:1.7.2.4 squid/src/auth/ntlm/auth_ntlm.h:1.7.2.5 *** squid/src/auth/ntlm/auth_ntlm.h:1.7.2.4 Wed Aug 25 14:24:04 2004 --- squid/src/auth/ntlm/auth_ntlm.h Sun Feb 20 12:07:46 2005 *************** *** 85,92 **** typedef struct _auth_ntlm_config auth_ntlm_config; typedef struct _ntlm_challenge_hash_pointer ntlm_challenge_hash_pointer; - extern MemPool *ntlm_helper_state_pool; - extern MemPool *ntlm_user_pool; - extern MemPool *ntlm_request_pool; - #endif --- 85,88 ----

AltStyle によって変換されたページ (->オリジナル) /