|
Lines 1-30
Link Here
|
| 1 |
This file contains a test for the presence of krb5-config; |
1 |
This file contains various patches that in general try to enable the |
| 2 |
it is needed to make the squid_kerb_auth helper program |
2 |
compilation of the squid_kerb_auth authentication helper program on |
| 3 |
compile against newer versions of Heimdal. See also |
3 |
all versions of FreeBSD that are currently supported by the FreeBSD |
| 4 |
files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in. |
4 |
ports framework where Heimdal is part of the base system. |
| 5 |
|
5 |
|
| 6 |
In order to have it applied before the icap26-boostrap.patch it is |
6 |
In order to have it applied before the icap26-boostrap.patch it is |
| 7 |
not merged into patch-configure. See the port's Makefile for further |
7 |
not merged into patch-configure. See the port's Makefile for further |
| 8 |
explanation. |
8 |
explanation. |
| 9 |
|
9 |
|
| 10 |
--- configure.orig 2008-04-25 21:49:52.000000000 +0200 |
10 |
--- configure 2008-04-25 21:49:52.000000000 +0200 |
| 11 |
+++ configure 2008-05-17 19:15:24.000000000 +0200 |
11 |
+++ configure 2008-05-26 15:19:54.000000000 +0200 |
| 12 |
@@ -753,6 +753,9 @@ |
12 |
@@ -753,10 +753,13 @@ |
| 13 |
NTLM_AUTH_HELPERS |
13 |
NTLM_AUTH_HELPERS |
| 14 |
DIGEST_AUTH_HELPERS |
14 |
DIGEST_AUTH_HELPERS |
| 15 |
NEGOTIATE_AUTH_HELPERS |
15 |
NEGOTIATE_AUTH_HELPERS |
|
|
16 |
-EXTERNAL_ACL_HELPERS |
| 16 |
+KRB5CONFIG |
17 |
+KRB5CONFIG |
| 17 |
+KERBLIBS |
18 |
+KERBLIBS |
| 18 |
+KERBINC |
19 |
+KERBINC |
| 19 |
EXTERNAL_ACL_HELPERS |
|
|
| 20 |
CPP |
20 |
CPP |
| 21 |
GREP |
21 |
GREP |
| 22 |
@@ -5591,6 +5594,62 @@ |
22 |
EGREP |
|
|
23 |
+EXTERNAL_ACL_HELPERS |
| 24 |
LIBSASL |
| 25 |
ENABLE_UNLINKD_TRUE |
| 26 |
ENABLE_UNLINKD_FALSE |
| 27 |
@@ -5591,50 +5594,59 @@ |
| 23 |
fi |
28 |
fi |
| 24 |
|
29 |
|
| 25 |
|
30 |
|
| 26 |
+ |
31 |
-# Check whether --enable-ntlm-fail-open was given. |
| 27 |
+ |
32 |
-if test "${enable_ntlm_fail_open+set}" = set; then |
|
|
33 |
- enableval=$enable_ntlm_fail_open; if test "$enableval" = "yes" ; then |
| 34 |
- |
| 35 |
-cat >>confdefs.h <<\_ACEOF |
| 36 |
-#define NTLM_FAIL_OPEN 1 |
| 37 |
-_ACEOF |
| 38 |
|
| 28 |
+if `echo "$NEGOTIATE_AUTH_HELPERS" | grep -q squid_kerb_auth`; then |
39 |
+if `echo "$NEGOTIATE_AUTH_HELPERS" | grep -q squid_kerb_auth`; then |
| 29 |
+ # Extract the first word of "krb5-config", so it can be a program name with args. |
40 |
+ # Extract the first word of "krb5-config", so it can be a program name with args. |
| 30 |
+set dummy krb5-config; ac_word=$2 |
41 |
+set dummy krb5-config; ac_word=$2 |
|
Lines 48-62
Link Here
|
| 48 |
+ ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" |
59 |
+ ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" |
| 49 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
60 |
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 50 |
+ break 2 |
61 |
+ break 2 |
| 51 |
+ fi |
62 |
fi |
| 52 |
+done |
63 |
+done |
| 53 |
+done |
64 |
+done |
| 54 |
+IFS=$as_save_IFS |
65 |
+IFS=$as_save_IFS |
| 55 |
+ |
66 |
|
| 56 |
+ test -z "$ac_cv_path_KRB5CONFIG" && ac_cv_path_KRB5CONFIG="false" |
67 |
+ test -z "$ac_cv_path_KRB5CONFIG" && ac_cv_path_KRB5CONFIG="false" |
| 57 |
+ ;; |
68 |
+ ;; |
| 58 |
+esac |
69 |
+esac |
| 59 |
+fi |
70 |
fi |
|
|
71 |
- |
| 72 |
- |
| 73 |
-EXTERNAL_ACL_HELPERS= |
| 74 |
-# Check whether --enable-external-acl-helpers was given. |
| 75 |
-if test "${enable_external_acl_helpers+set}" = set; then |
| 76 |
- enableval=$enable_external_acl_helpers; case "$enableval" in |
| 77 |
- yes) |
| 78 |
- echo "ERROR: --enable-external-acl-helpers requires an argument" |
| 79 |
- exit 1 |
| 80 |
- ;; |
| 81 |
- no) |
| 82 |
- ;; |
| 83 |
- *) |
| 84 |
- EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" |
| 85 |
- esac |
| 86 |
- |
| 60 |
+KRB5CONFIG=$ac_cv_path_KRB5CONFIG |
87 |
+KRB5CONFIG=$ac_cv_path_KRB5CONFIG |
| 61 |
+if test -n "$KRB5CONFIG"; then |
88 |
+if test -n "$KRB5CONFIG"; then |
| 62 |
+ { echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5 |
89 |
+ { echo "$as_me:$LINENO: result: $KRB5CONFIG" >&5 |
|
Lines 64-72
Link Here
|
| 64 |
+else |
91 |
+else |
| 65 |
+ { echo "$as_me:$LINENO: result: no" >&5 |
92 |
+ { echo "$as_me:$LINENO: result: no" >&5 |
| 66 |
+echo "${ECHO_T}no" >&6; } |
93 |
+echo "${ECHO_T}no" >&6; } |
| 67 |
+fi |
94 |
fi |
| 68 |
+ |
95 |
|
| 69 |
+ |
96 |
-if test -n "$EXTERNAL_ACL_HELPERS"; then |
|
|
97 |
- for helper in $EXTERNAL_ACL_HELPERS; do |
| 98 |
- if test -f $srcdir/helpers/external_acl/$helper/Makefile.in; then |
| 99 |
- : |
| 100 |
- else |
| 101 |
- echo "ERROR: external acl helper $helper does not exists" |
| 102 |
- exit 1 |
| 103 |
- fi |
| 104 |
- done |
| 105 |
- echo "External acl helpers built: $EXTERNAL_ACL_HELPERS" |
| 106 |
-fi |
| 107 |
|
| 70 |
+ if test -z "$KRB5CONFIG"; then |
108 |
+ if test -z "$KRB5CONFIG"; then |
| 71 |
+ { { echo "$as_me:$LINENO: error: sorry" >&5 |
109 |
+ { { echo "$as_me:$LINENO: error: sorry" >&5 |
| 72 |
+echo "$as_me: error: sorry" >&2;} |
110 |
+echo "$as_me: error: sorry" >&2;} |
|
Lines 74-98
Link Here
|
| 74 |
+ else |
112 |
+ else |
| 75 |
+ KERBLIBS=`$KRB5CONFIG --libs gssapi` |
113 |
+ KERBLIBS=`$KRB5CONFIG --libs gssapi` |
| 76 |
+ KERBINC=`$KRB5CONFIG --cflags` |
114 |
+ KERBINC=`$KRB5CONFIG --cflags` |
|
|
115 |
|
| 116 |
|
| 117 |
-if test "$require_sasl" = "yes"; then |
| 118 |
+ fi |
| 119 |
|
| 120 |
ac_ext=c |
| 121 |
ac_cpp='$CPP $CPPFLAGS' |
| 122 |
@@ -6273,6 +6285,349 @@ |
| 123 |
|
| 124 |
|
| 125 |
|
| 126 |
+for ac_header in gssapi/gssapi.h |
| 127 |
+do |
| 128 |
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 129 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 130 |
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 131 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 132 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 133 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 134 |
+fi |
| 135 |
+ac_res=`eval echo '${'$as_ac_Header'}'` |
| 136 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 137 |
+echo "${ECHO_T}$ac_res" >&6; } |
| 138 |
+else |
| 139 |
+ # Is the header compilable? |
| 140 |
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 141 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } |
| 142 |
+cat >conftest.$ac_ext <<_ACEOF |
| 143 |
+/* confdefs.h. */ |
| 144 |
+_ACEOF |
| 145 |
+cat confdefs.h >>conftest.$ac_ext |
| 146 |
+cat >>conftest.$ac_ext <<_ACEOF |
| 147 |
+/* end confdefs.h. */ |
| 148 |
+$ac_includes_default |
| 149 |
+#include <$ac_header> |
| 150 |
+_ACEOF |
| 151 |
+rm -f conftest.$ac_objext |
| 152 |
+if { (ac_try="$ac_compile" |
| 153 |
+case "(($ac_try" in |
| 154 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 155 |
+ *) ac_try_echo=$ac_try;; |
| 156 |
+esac |
| 157 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 158 |
+ (eval "$ac_compile") 2>conftest.er1 |
| 159 |
+ ac_status=$? |
| 160 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
| 161 |
+ rm -f conftest.er1 |
| 162 |
+ cat conftest.err >&5 |
| 163 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 164 |
+ (exit $ac_status); } && { |
| 165 |
+ test -z "$ac_c_werror_flag" || |
| 166 |
+ test ! -s conftest.err |
| 167 |
+ } && test -s conftest.$ac_objext; then |
| 168 |
+ ac_header_compiler=yes |
| 169 |
+else |
| 170 |
+ echo "$as_me: failed program was:" >&5 |
| 171 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
| 77 |
+ |
172 |
+ |
|
|
173 |
+ ac_header_compiler=no |
| 174 |
+fi |
| 78 |
+ |
175 |
+ |
|
|
176 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 177 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 178 |
+echo "${ECHO_T}$ac_header_compiler" >&6; } |
| 179 |
+ |
| 180 |
+# Is the header present? |
| 181 |
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 182 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } |
| 183 |
+cat >conftest.$ac_ext <<_ACEOF |
| 184 |
+/* confdefs.h. */ |
| 185 |
+_ACEOF |
| 186 |
+cat confdefs.h >>conftest.$ac_ext |
| 187 |
+cat >>conftest.$ac_ext <<_ACEOF |
| 188 |
+/* end confdefs.h. */ |
| 189 |
+#include <$ac_header> |
| 190 |
+_ACEOF |
| 191 |
+if { (ac_try="$ac_cpp conftest.$ac_ext" |
| 192 |
+case "(($ac_try" in |
| 193 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 194 |
+ *) ac_try_echo=$ac_try;; |
| 195 |
+esac |
| 196 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 197 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 198 |
+ ac_status=$? |
| 199 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
| 200 |
+ rm -f conftest.er1 |
| 201 |
+ cat conftest.err >&5 |
| 202 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 203 |
+ (exit $ac_status); } >/dev/null && { |
| 204 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 205 |
+ test ! -s conftest.err |
| 206 |
+ }; then |
| 207 |
+ ac_header_preproc=yes |
| 208 |
+else |
| 209 |
+ echo "$as_me: failed program was:" >&5 |
| 210 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
| 211 |
+ |
| 212 |
+ ac_header_preproc=no |
| 213 |
+fi |
| 214 |
+ |
| 215 |
+rm -f conftest.err conftest.$ac_ext |
| 216 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 217 |
+echo "${ECHO_T}$ac_header_preproc" >&6; } |
| 218 |
+ |
| 219 |
+# So? What about this header? |
| 220 |
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
| 221 |
+ yes:no: ) |
| 222 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 223 |
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 224 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 225 |
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 226 |
+ ac_header_preproc=yes |
| 227 |
+ ;; |
| 228 |
+ no:yes:* ) |
| 229 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 230 |
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 231 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 232 |
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 233 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 234 |
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 235 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 236 |
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 237 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 238 |
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 239 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 240 |
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 241 |
+ ( cat <<\_ASBOX |
| 242 |
+## ----------------------------------------------- ## |
| 243 |
+## Report this to http://www.squid-cache.org/bugs/ ## |
| 244 |
+## ----------------------------------------------- ## |
| 245 |
+_ASBOX |
| 246 |
+ ) | sed "s/^/$as_me: WARNING: /" >&2 |
| 247 |
+ ;; |
| 248 |
+esac |
| 249 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 250 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 251 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 252 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 253 |
+else |
| 254 |
+ eval "$as_ac_Header=\$ac_header_preproc" |
| 255 |
+fi |
| 256 |
+ac_res=`eval echo '${'$as_ac_Header'}'` |
| 257 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 258 |
+echo "${ECHO_T}$ac_res" >&6; } |
| 259 |
+ |
| 260 |
+fi |
| 261 |
+if test `eval echo '${'$as_ac_Header'}'` = yes; then |
| 262 |
+ cat >>confdefs.h <<_ACEOF |
| 263 |
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 264 |
+_ACEOF |
| 265 |
+ |
| 266 |
+fi |
| 267 |
+ |
| 268 |
+done |
| 269 |
+ |
| 270 |
+ if test x"$ac_cv_header_gssapi_gssapi_h" != x"yes"; then |
| 271 |
+ |
| 272 |
+for ac_header in gssapi.h |
| 273 |
+do |
| 274 |
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 275 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 276 |
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 277 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 278 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 279 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 280 |
+fi |
| 281 |
+ac_res=`eval echo '${'$as_ac_Header'}'` |
| 282 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 283 |
+echo "${ECHO_T}$ac_res" >&6; } |
| 284 |
+else |
| 285 |
+ # Is the header compilable? |
| 286 |
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 287 |
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } |
| 288 |
+cat >conftest.$ac_ext <<_ACEOF |
| 289 |
+/* confdefs.h. */ |
| 290 |
+_ACEOF |
| 291 |
+cat confdefs.h >>conftest.$ac_ext |
| 292 |
+cat >>conftest.$ac_ext <<_ACEOF |
| 293 |
+/* end confdefs.h. */ |
| 294 |
+$ac_includes_default |
| 295 |
+#include <$ac_header> |
| 296 |
+_ACEOF |
| 297 |
+rm -f conftest.$ac_objext |
| 298 |
+if { (ac_try="$ac_compile" |
| 299 |
+case "(($ac_try" in |
| 300 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 301 |
+ *) ac_try_echo=$ac_try;; |
| 302 |
+esac |
| 303 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 304 |
+ (eval "$ac_compile") 2>conftest.er1 |
| 305 |
+ ac_status=$? |
| 306 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
| 307 |
+ rm -f conftest.er1 |
| 308 |
+ cat conftest.err >&5 |
| 309 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 310 |
+ (exit $ac_status); } && { |
| 311 |
+ test -z "$ac_c_werror_flag" || |
| 312 |
+ test ! -s conftest.err |
| 313 |
+ } && test -s conftest.$ac_objext; then |
| 314 |
+ ac_header_compiler=yes |
| 315 |
+else |
| 316 |
+ echo "$as_me: failed program was:" >&5 |
| 317 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
| 318 |
+ |
| 319 |
+ ac_header_compiler=no |
| 320 |
+fi |
| 321 |
+ |
| 322 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 323 |
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 324 |
+echo "${ECHO_T}$ac_header_compiler" >&6; } |
| 325 |
+ |
| 326 |
+# Is the header present? |
| 327 |
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 328 |
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } |
| 329 |
+cat >conftest.$ac_ext <<_ACEOF |
| 330 |
+/* confdefs.h. */ |
| 331 |
+_ACEOF |
| 332 |
+cat confdefs.h >>conftest.$ac_ext |
| 333 |
+cat >>conftest.$ac_ext <<_ACEOF |
| 334 |
+/* end confdefs.h. */ |
| 335 |
+#include <$ac_header> |
| 336 |
+_ACEOF |
| 337 |
+if { (ac_try="$ac_cpp conftest.$ac_ext" |
| 338 |
+case "(($ac_try" in |
| 339 |
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 340 |
+ *) ac_try_echo=$ac_try;; |
| 341 |
+esac |
| 342 |
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 343 |
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 344 |
+ ac_status=$? |
| 345 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
| 346 |
+ rm -f conftest.er1 |
| 347 |
+ cat conftest.err >&5 |
| 348 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 349 |
+ (exit $ac_status); } >/dev/null && { |
| 350 |
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 351 |
+ test ! -s conftest.err |
| 352 |
+ }; then |
| 353 |
+ ac_header_preproc=yes |
| 354 |
+else |
| 355 |
+ echo "$as_me: failed program was:" >&5 |
| 356 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
| 357 |
+ |
| 358 |
+ ac_header_preproc=no |
| 359 |
+fi |
| 360 |
+ |
| 361 |
+rm -f conftest.err conftest.$ac_ext |
| 362 |
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 363 |
+echo "${ECHO_T}$ac_header_preproc" >&6; } |
| 364 |
+ |
| 365 |
+# So? What about this header? |
| 366 |
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
| 367 |
+ yes:no: ) |
| 368 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 369 |
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 370 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 371 |
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 372 |
+ ac_header_preproc=yes |
| 373 |
+ ;; |
| 374 |
+ no:yes:* ) |
| 375 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 376 |
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 377 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 378 |
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 379 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 380 |
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 381 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 382 |
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 383 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 384 |
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 385 |
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 386 |
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 387 |
+ ( cat <<\_ASBOX |
| 388 |
+## ----------------------------------------------- ## |
| 389 |
+## Report this to http://www.squid-cache.org/bugs/ ## |
| 390 |
+## ----------------------------------------------- ## |
| 391 |
+_ASBOX |
| 392 |
+ ) | sed "s/^/$as_me: WARNING: /" >&2 |
| 393 |
+ ;; |
| 394 |
+esac |
| 395 |
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 396 |
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 397 |
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 398 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 399 |
+else |
| 400 |
+ eval "$as_ac_Header=\$ac_header_preproc" |
| 401 |
+fi |
| 402 |
+ac_res=`eval echo '${'$as_ac_Header'}'` |
| 403 |
+ { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 404 |
+echo "${ECHO_T}$ac_res" >&6; } |
| 405 |
+ |
| 406 |
+fi |
| 407 |
+if test `eval echo '${'$as_ac_Header'}'` = yes; then |
| 408 |
+ cat >>confdefs.h <<_ACEOF |
| 409 |
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 410 |
+_ACEOF |
| 411 |
+ |
| 412 |
+else |
| 413 |
+ { { echo "$as_me:$LINENO: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&5 |
| 414 |
+echo "$as_me: error: neither <gssapi/gssapi.h> nor <gssapi.h> found" >&2;} |
| 415 |
+ { (exit 1); exit 1; }; } |
| 416 |
+ |
| 417 |
+fi |
| 418 |
+ |
| 419 |
+done |
| 420 |
+ |
| 79 |
+ fi |
421 |
+ fi |
| 80 |
+fi |
422 |
+fi |
| 81 |
+ |
423 |
+ |
| 82 |
# Check whether --enable-ntlm-fail-open was given. |
424 |
+# Check whether --enable-ntlm-fail-open was given. |
| 83 |
if test "${enable_ntlm_fail_open+set}" = set; then |
425 |
+if test "${enable_ntlm_fail_open+set}" = set; then |
| 84 |
enableval=$enable_ntlm_fail_open; if test "$enableval" = "yes" ; then |
426 |
+ enableval=$enable_ntlm_fail_open; if test "$enableval" = "yes" ; then |
| 85 |
@@ -27733,6 +27792,9 @@ |
427 |
+ |
|
|
428 |
+cat >>confdefs.h <<\_ACEOF |
| 429 |
+#define NTLM_FAIL_OPEN 1 |
| 430 |
+_ACEOF |
| 431 |
+ |
| 432 |
+ fi |
| 433 |
+ |
| 434 |
+fi |
| 435 |
+ |
| 436 |
+ |
| 437 |
+EXTERNAL_ACL_HELPERS= |
| 438 |
+# Check whether --enable-external-acl-helpers was given. |
| 439 |
+if test "${enable_external_acl_helpers+set}" = set; then |
| 440 |
+ enableval=$enable_external_acl_helpers; case "$enableval" in |
| 441 |
+ yes) |
| 442 |
+ echo "ERROR: --enable-external-acl-helpers requires an argument" |
| 443 |
+ exit 1 |
| 444 |
+ ;; |
| 445 |
+ no) |
| 446 |
+ ;; |
| 447 |
+ *) |
| 448 |
+ EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" |
| 449 |
+ esac |
| 450 |
+ |
| 451 |
+fi |
| 452 |
+ |
| 453 |
+if test -n "$EXTERNAL_ACL_HELPERS"; then |
| 454 |
+ for helper in $EXTERNAL_ACL_HELPERS; do |
| 455 |
+ if test -f $srcdir/helpers/external_acl/$helper/Makefile.in; then |
| 456 |
+ : |
| 457 |
+ else |
| 458 |
+ echo "ERROR: external acl helper $helper does not exists" |
| 459 |
+ exit 1 |
| 460 |
+ fi |
| 461 |
+ done |
| 462 |
+ echo "External acl helpers built: $EXTERNAL_ACL_HELPERS" |
| 463 |
+fi |
| 464 |
+ |
| 465 |
+ |
| 466 |
+ |
| 467 |
+if test "$require_sasl" = "yes"; then |
| 468 |
+ |
| 469 |
|
| 470 |
for ac_header in sasl/sasl.h sasl.h |
| 471 |
do |
| 472 |
@@ -27733,10 +28088,13 @@ |
| 86 |
NTLM_AUTH_HELPERS!$NTLM_AUTH_HELPERS$ac_delim |
473 |
NTLM_AUTH_HELPERS!$NTLM_AUTH_HELPERS$ac_delim |
| 87 |
DIGEST_AUTH_HELPERS!$DIGEST_AUTH_HELPERS$ac_delim |
474 |
DIGEST_AUTH_HELPERS!$DIGEST_AUTH_HELPERS$ac_delim |
| 88 |
NEGOTIATE_AUTH_HELPERS!$NEGOTIATE_AUTH_HELPERS$ac_delim |
475 |
NEGOTIATE_AUTH_HELPERS!$NEGOTIATE_AUTH_HELPERS$ac_delim |
|
|
476 |
-EXTERNAL_ACL_HELPERS!$EXTERNAL_ACL_HELPERS$ac_delim |
| 89 |
+KRB5CONFIG!$KRB5CONFIG$ac_delim |
477 |
+KRB5CONFIG!$KRB5CONFIG$ac_delim |
| 90 |
+KERBLIBS!$KERBLIBS$ac_delim |
478 |
+KERBLIBS!$KERBLIBS$ac_delim |
| 91 |
+KERBINC!$KERBINC$ac_delim |
479 |
+KERBINC!$KERBINC$ac_delim |
| 92 |
EXTERNAL_ACL_HELPERS!$EXTERNAL_ACL_HELPERS$ac_delim |
|
|
| 93 |
CPP!$CPP$ac_delim |
480 |
CPP!$CPP$ac_delim |
| 94 |
GREP!$GREP$ac_delim |
481 |
GREP!$GREP$ac_delim |
| 95 |
@@ -27784,7 +27846,7 @@ |
482 |
EGREP!$EGREP$ac_delim |
|
|
483 |
+EXTERNAL_ACL_HELPERS!$EXTERNAL_ACL_HELPERS$ac_delim |
| 484 |
LIBSASL!$LIBSASL$ac_delim |
| 485 |
ENABLE_UNLINKD_TRUE!$ENABLE_UNLINKD_TRUE$ac_delim |
| 486 |
ENABLE_UNLINKD_FALSE!$ENABLE_UNLINKD_FALSE$ac_delim |
| 487 |
@@ -27784,7 +28142,7 @@ |
| 96 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
488 |
LTLIBOBJS!$LTLIBOBJS$ac_delim |
| 97 |
_ACEOF |
489 |
_ACEOF |
| 98 |
|
490 |
|
|
Lines 101-103
Link Here
|
| 101 |
break |
493 |
break |
| 102 |
elif $ac_last_try; then |
494 |
elif $ac_last_try; then |
| 103 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
495 |
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
|
|
496 |
--- include/autoconf.h.in.orig 2007-09-02 02:14:59.000000000 +0200 |
| 497 |
+++ include/autoconf.h.in 2008-05-26 14:16:26.000000000 +0200 |
| 498 |
@@ -155,6 +155,12 @@ |
| 499 |
/* Define to 1 if you have the <grp.h> header file. */ |
| 500 |
#undef HAVE_GRP_H |
| 501 |
|
| 502 |
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */ |
| 503 |
+#undef HAVE_GSSAPI_GSSAPI_H |
| 504 |
+ |
| 505 |
+/* Define to 1 if you have the <gssapi.h> header file. */ |
| 506 |
+#undef HAVE_GSSAPI_H |
| 507 |
+ |
| 508 |
/* Define to 1 if you have the `initgroups' function. */ |
| 509 |
#undef HAVE_INITGROUPS |
| 510 |
|
| 511 |
--- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig 2008-05-17 18:06:10.000000000 +0200 |
| 512 |
+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in 2008-05-17 18:40:15.000000000 +0200 |
| 513 |
@@ -130,6 +130,18 @@ |
| 514 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 515 |
INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
| 516 |
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
| 517 |
+#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) |
| 518 |
+ |
| 519 |
+# HEIMDAL |
| 520 |
+#KERBINC = -DHEIMDAL -I/usr/include/heimdal |
| 521 |
+#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken |
| 522 |
+ |
| 523 |
+# MIT |
| 524 |
+#KERBINC = |
| 525 |
+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |
| 526 |
+KERBINC = -DHEIMDAL @KERBINC@ |
| 527 |
+KERBLIBS = @KERBLIBS@ |
| 528 |
+KRB5CONFIG = @KRB5CONFIG@ |
| 529 |
LDFLAGS = @LDFLAGS@ |
| 530 |
LIBDLMALLOC = @LIBDLMALLOC@ |
| 531 |
LIBOBJS = @LIBOBJS@ |
| 532 |
@@ -267,15 +279,6 @@ |
| 533 |
squid_kerb_auth_SOURCES = $(SOURCE) $(SPNEGO) |
| 534 |
#-I$(top_srcdir)/include -I$(top_srcdir)/src |
| 535 |
LDADD = $(KERBLIBS) |
| 536 |
-#-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) |
| 537 |
- |
| 538 |
-# HEIMDAL |
| 539 |
-#KERBINC = -DHEIMDAL -I/usr/include/heimdal |
| 540 |
-#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken |
| 541 |
- |
| 542 |
-# MIT |
| 543 |
-KERBINC = |
| 544 |
-KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err |
| 545 |
all: all-am |
| 546 |
|
| 547 |
.SUFFIXES: |
| 548 |
--- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig 2008-03-18 00:33:00.000000000 +0100 |
| 549 |
+++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 2008-05-26 15:29:56.000000000 +0200 |
| 550 |
@@ -24,6 +24,7 @@ |
| 551 |
/* |
| 552 |
* Hosted at http://sourceforge.net/projects/squidkerbauth |
| 553 |
*/ |
| 554 |
+#include "config.h" |
| 555 |
#include <string.h> |
| 556 |
#include <stdio.h> |
| 557 |
#include <stdlib.h> |
| 558 |
@@ -31,6 +32,7 @@ |
| 559 |
#include <unistd.h> |
| 560 |
#include <time.h> |
| 561 |
#include <sys/time.h> |
| 562 |
+#include <sys/param.h> |
| 563 |
|
| 564 |
#include "base64.h" |
| 565 |
#ifndef HAVE_SPNEGO |
| 566 |
@@ -47,7 +49,11 @@ |
| 567 |
#define PROGRAM "squid_kerb_auth" |
| 568 |
|
| 569 |
#ifdef HEIMDAL |
| 570 |
+#ifdef HAVE_GSSAPI_GSSAPI_H |
| 571 |
+#include <gssapi/gssapi.h> |
| 572 |
+#else |
| 573 |
#include <gssapi.h> |
| 574 |
+#endif |
| 575 |
#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE |
| 576 |
#else |
| 577 |
#include <gssapi/gssapi.h> |