Attachment #238801 for bug #311927




                       else
                         ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
                         if test "x$ac_gssapi_libs" != "x" ; then
                           LIBS="$LIBS $ac_gssapi_libs"
                         else
                           for lib in $ac_gss_libs; do
                             AC_CHECK_LIB($lib,main)

                     fi
                     ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
                     if test "x$ac_gssapi_libs" != "x" ; then
                         LIBS="$LIBS $ac_gssapi_libs"
                     else
                         for lib in $ac_gss_libs; do
                            AC_CHECK_LIB($lib,main)

                             ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
                             LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
                           fi
                           LIBS="$LIBS $ac_gssapi_libs"
                         else
                           for lib in $ac_gss_libs; do
                             AC_CHECK_LIB($lib,main)

                           ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
                           LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
                         fi
                         LIBS="$LIBS $ac_gssapi_libs"
                     else
                         for lib in $ac_gss_libs; do
                            AC_CHECK_LIB($lib,main)

Lines 999-1006 Link Here

(-)squid-3.1.4.orig/src/forward.cc (-2 / +6 lines)
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

Lines 94-100 Link Here

(-)squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in (-4 / +4 lines)
94	else	94	else
95	ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`	95	ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
96	if test "x$ac_gssapi_libs" != "x" ; then	96	if test "x$ac_gssapi_libs" != "x" ; then
97	LDFLAGS="$LDFLAGS $ac_gssapi_libs"	97	LIBS="$LIBS $ac_gssapi_libs"
98	else	98	else
99	for lib in $ac_gss_libs; do	99	for lib in $ac_gss_libs; do
100	AC_CHECK_LIB($lib,main)	100	AC_CHECK_LIB($lib,main)
Lines 118-124 Link Here
118	fi	118	fi
119	ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`	119	ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
120	if test "x$ac_gssapi_libs" != "x" ; then	120	if test "x$ac_gssapi_libs" != "x" ; then
121	LDFLAGS="$LDFLAGS $ac_gssapi_libs"	121	LIBS="$LIBS $ac_gssapi_libs"
122	else	122	else
123	for lib in $ac_gss_libs; do	123	for lib in $ac_gss_libs; do
124	AC_CHECK_LIB($lib,main)	124	AC_CHECK_LIB($lib,main)
Lines 172-178 Link Here
172	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/ .//'`
173	LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"	173	LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
174	fi	174	fi
175	LDFLAGS="$LDFLAGS $ac_gssapi_libs"	175	LIBS="$LIBS $ac_gssapi_libs"
176	else	176	else
177	for lib in $ac_gss_libs; do	177	for lib in $ac_gss_libs; do
178	AC_CHECK_LIB($lib,main)	178	AC_CHECK_LIB($lib,main)
Lines 201-207 Link Here
201	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/ .//'`
202	LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"	202	LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
203	fi	203	fi
204	LDFLAGS="$LDFLAGS $ac_gssapi_libs"	204	LIBS="$LIBS $ac_gssapi_libs"
205	else	205	else
206	for lib in $ac_gss_libs; do	206	for lib in $ac_gss_libs; do
207	AC_CHECK_LIB($lib,main)	207	AC_CHECK_LIB($lib,main)