1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
diff -Nru squid-3.1.0.13.orig/src/forward.cc squid-3.1.0.13/src/forward.cc
--- squid-3.1.0.13.orig/src/forward.cc 2009-08-04 15:32:17.000000000 +0200
+++ squid-3.1.0.13/src/forward.cc 2009-08-06 23:34:54.000000000 +0200
@@ -995,7 +995,12 @@
break;
if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
- clientFde->upstreamTOS = (unsigned char)(*(int*)CMSG_DATA(o));
+ union {
+ unsigned char *pchar;
+ int *pint;
+ } data;
+ data.pchar = CMSG_DATA(o);
+ clientFde->upstreamTOS = (unsigned char)*data.pint;
break;
}
p += CMSG_LEN(o->cmsg_len);
diff -Nru squid-3.1.0.13.orig/src/ftp.cc squid-3.1.0.13/src/ftp.cc
--- squid-3.1.0.13.orig/src/ftp.cc 2009-08-04 15:32:17.000000000 +0200
+++ squid-3.1.0.13/src/ftp.cc 2009-08-06 23:32:39.000000000 +0200
@@ -534,16 +534,18 @@
void
FtpStateData::loginParser(const char *login, int escaped)
{
- char *s = NULL;
+ const char *s = NULL;
debugs(9, 4, HERE << ": login='" << login << "', escaped=" << escaped);
debugs(9, 9, HERE << ": IN : login='" << login << "', escaped=" << escaped << ", user=" << user << ", password=" << password);
if ((s = strchr(login, ':'))) {
- *s = '\0';
-
/* if there was a username part */
if (s > login) {
- xstrncpy(user, login, MAX_URL);
+ int len = s - login;
+ if (len > MAX_URL)
+ len = MAX_URL;
+ xstrncpy(user, login, len);
+ user[len] = '\0';
if (escaped)
rfc1738_unescape(user);
}
diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-08-19 19:00:43.000000000 +0200
+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-08-22 12:53:13.000000000 +0200
@@ -94,7 +94,7 @@
else
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
if test "x$ac_gssapi_libs" != "x" ; then
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -118,7 +118,7 @@
fi
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
if test "x$ac_gssapi_libs" != "x" ; then
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -172,7 +172,7 @@
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
fi
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
@@ -201,7 +201,7 @@
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
fi
- LDFLAGS="$LDFLAGS $ac_gssapi_libs"
+ LIBS="$LIBS $ac_gssapi_libs"
else
for lib in $ac_gss_libs; do
AC_CHECK_LIB($lib,main)
|
GitWeb