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
|
diff -Nru squid-3.1.0.14.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.14/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.0.14.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-10-22 23:58:58.000000000 +0200
+++ squid-3.1.0.14/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-10-22 23:59:11.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)
diff -Nru squid-3.1.0.14.orig/src/forward.cc squid-3.1.0.14/src/forward.cc
--- squid-3.1.0.14.orig/src/forward.cc 2009-09-27 05:28:33.000000000 +0200
+++ squid-3.1.0.14/src/forward.cc 2009-10-22 23:59:11.000000000 +0200
@@ -999,7 +999,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);
|
GitWeb
