Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 311927 | Differences between
and this patch

Collapse All | Expand All

(-)squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in (-4 / +4 lines)
Lines 93-99 Link Here
93
                       else
94
                       else
94
                         ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
95
                         ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
95
                         if test "x$ac_gssapi_libs" != "x" ; then
96
                         if test "x$ac_gssapi_libs" != "x" ; then
96
                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
97
                           LIBS="$LIBS $ac_gssapi_libs"
97
                         else
98
                         else
98
                           for lib in $ac_gss_libs; do
99
                           for lib in $ac_gss_libs; do
99
                             AC_CHECK_LIB($lib,main)
100
                             AC_CHECK_LIB($lib,main)
Lines 117-123 Link Here
117
                     fi
118
                     fi
118
                     ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
119
                     ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
119
                     if test "x$ac_gssapi_libs" != "x" ; then
120
                     if test "x$ac_gssapi_libs" != "x" ; then
120
                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
121
                         LIBS="$LIBS $ac_gssapi_libs"
121
                     else
122
                     else
122
                         for lib in $ac_gss_libs; do
123
                         for lib in $ac_gss_libs; do
123
                            AC_CHECK_LIB($lib,main)
124
                            AC_CHECK_LIB($lib,main)
Lines 171-177 Link Here
171
                             ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
172
                             ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
172
                             LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
173
                             LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
173
                           fi
174
                           fi
174
                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
175
                           LIBS="$LIBS $ac_gssapi_libs"
175
                         else
176
                         else
176
                           for lib in $ac_gss_libs; do
177
                           for lib in $ac_gss_libs; do
177
                             AC_CHECK_LIB($lib,main)
178
                             AC_CHECK_LIB($lib,main)
Lines 200-206 Link Here
200
                           ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
201
                           ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
201
                           LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
202
                           LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
202
                         fi
203
                         fi
203
                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
204
                         LIBS="$LIBS $ac_gssapi_libs"
204
                     else
205
                     else
205
                         for lib in $ac_gss_libs; do
206
                         for lib in $ac_gss_libs; do
206
                            AC_CHECK_LIB($lib,main)
207
                            AC_CHECK_LIB($lib,main)
(-)squid-3.1.1.orig/src/forward.cc (-2 / +6 lines)
Lines 999-1006 Link Here
999
                        break;
999
                        break;
1000
1000
1001
                    if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
1001
                    if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
1002
                        int *tmp = (int*)CMSG_DATA(o);
1002
                        union {
1003
                        clientFde->upstreamTOS = (unsigned char)*tmp;
1003
                           unsigned char *pchar;
1004
                           int  *pint;
1005
                        } data;
1006
                        data.pchar = CMSG_DATA(o);
1007
                        clientFde->upstreamTOS = (unsigned char)*data.pint;
1004
                        break;
1008
                        break;
1005
                    }
1009
                    }
1006
                    pbuf += CMSG_LEN(o->cmsg_len);
1010
                    pbuf += CMSG_LEN(o->cmsg_len);

Return to bug 311927