mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
Merge branch '962-bind-just-disables-gssapi-support-if-no-gssapi-krb5-headers-found' into 'master'
Resolve "Bind just disables GSSAPI support if no GSSAPI/KRB5 headers found" Closes #962 See merge request isc-projects/bind9!1815
This commit is contained in:
Mark Andrews
37
configure
vendored
37
configure
vendored
@@ -841,7 +841,6 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@@ -999,7 +998,6 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@@ -1252,15 +1250,6 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -1398,7 +1387,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir runstatedir
|
||||
libdir localedir mandir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1551,7 +1540,6 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@@ -1648,7 +1636,7 @@ Optional Packages:
|
||||
PKCS11 provider)
|
||||
--with-gssapi=PATH|/path/krb5-config
|
||||
Specify path for system-supplied GSSAPI
|
||||
[default=yes]
|
||||
[default=auto]
|
||||
--with-lmdb=PATH build with LMDB library [yes|no|path]
|
||||
--with-libxml2=PATH build with libxml2 library [yes|no|path]
|
||||
--with-libjson=PATH build with libjson0 library [yes|no|path]
|
||||
@@ -3939,7 +3927,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -3985,7 +3973,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -4009,7 +3997,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -4054,7 +4042,7 @@ else
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -4078,7 +4066,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
We can't simply define LARGE_OFF_T to be 9223372036854775807,
|
||||
since some C++ compilers masquerading as C compilers
|
||||
incorrectly reject 9223372036854775807. */
|
||||
#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
|
||||
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
||||
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
||||
&& LARGE_OFF_T % 2147483647 == 1)
|
||||
? 1 : -1];
|
||||
@@ -16319,7 +16307,7 @@ $as_echo_n "checking for GSSAPI library... " >&6; }
|
||||
if test "${with_gssapi+set}" = set; then :
|
||||
withval=$with_gssapi; use_gssapi="$withval"
|
||||
else
|
||||
use_gssapi="yes"
|
||||
use_gssapi="auto"
|
||||
fi
|
||||
|
||||
|
||||
@@ -16459,7 +16447,7 @@ esac
|
||||
|
||||
case "$host" in
|
||||
*darwin*)
|
||||
if test "yes" = "$use_gssapi"
|
||||
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
|
||||
then
|
||||
use_gssapi=framework
|
||||
fi
|
||||
@@ -16472,7 +16460,7 @@ esac
|
||||
# for the specification of gssapi and krb5 headers in different locations,
|
||||
# which probably ought to be fixed although fixing might raise the issue of
|
||||
# trying to build with incompatible versions of gssapi and krb5.
|
||||
if test "yes" = "$use_gssapi"
|
||||
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
|
||||
then
|
||||
# first, deal with the obvious
|
||||
if test \( -f /usr/include/kerberosv5/krb5.h -o \
|
||||
@@ -16496,8 +16484,11 @@ then
|
||||
break
|
||||
fi
|
||||
fi
|
||||
use_gssapi="no"
|
||||
done
|
||||
if test "auto" = "$use_gssapi"
|
||||
then
|
||||
use_gssapi="no"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
13
configure.ac
13
configure.ac
@@ -932,8 +932,8 @@ AC_MSG_CHECKING(for GSSAPI library)
|
||||
AC_ARG_WITH(gssapi,
|
||||
AS_HELP_STRING([--with-gssapi=[PATH|[/path/]krb5-config]],
|
||||
[Specify path for system-supplied GSSAPI
|
||||
[default=yes]]),
|
||||
use_gssapi="$withval", use_gssapi="yes")
|
||||
[default=auto]]),
|
||||
use_gssapi="$withval", use_gssapi="auto")
|
||||
|
||||
# first try using krb5-config, if that does not work then fall back to "yes" method.
|
||||
|
||||
@@ -987,7 +987,7 @@ esac
|
||||
|
||||
case "$host" in
|
||||
*darwin*)
|
||||
if test "yes" = "$use_gssapi"
|
||||
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
|
||||
then
|
||||
use_gssapi=framework
|
||||
fi
|
||||
@@ -1000,7 +1000,7 @@ esac
|
||||
# for the specification of gssapi and krb5 headers in different locations,
|
||||
# which probably ought to be fixed although fixing might raise the issue of
|
||||
# trying to build with incompatible versions of gssapi and krb5.
|
||||
if test "yes" = "$use_gssapi"
|
||||
if test "yes" = "$use_gssapi" -o "auto" = "$use_gssapi"
|
||||
then
|
||||
# first, deal with the obvious
|
||||
if test \( -f /usr/include/kerberosv5/krb5.h -o \
|
||||
@@ -1024,8 +1024,11 @@ then
|
||||
break
|
||||
fi
|
||||
fi
|
||||
use_gssapi="no"
|
||||
done
|
||||
if test "auto" = "$use_gssapi"
|
||||
then
|
||||
use_gssapi="no"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user