mirror of
https://github.com/samba-team/samba.git
synced 2025-09-16 01:44:21 +03:00
Finish Jeremy's passdb merge :-).
(fix up configure.in for default (smbpasswd) option)
Rerun autoconf.
(This used to be commit 0b9e13530d
)
This commit is contained in:
299
source3/configure
vendored
299
source3/configure
vendored
File diff suppressed because it is too large
Load Diff
@@ -1748,15 +1748,27 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
########################################################################################
|
||||||
|
##
|
||||||
|
## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER
|
||||||
|
##
|
||||||
|
########################################################################################
|
||||||
|
|
||||||
|
## set the with_smbpasswd_sam as the default
|
||||||
|
with_smbpasswd_sam=yes
|
||||||
|
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
# check for a TDB password database
|
# check for a TDB password database
|
||||||
AC_MSG_CHECKING(whether to use TDB password database)
|
AC_MSG_CHECKING(whether to use TDB SAM database)
|
||||||
AC_ARG_WITH(tdbsam,
|
AC_ARG_WITH(tdbsam,
|
||||||
[ --with-tdbsam Include experimental TDB password database (default=no)],
|
[ --with-tdbsam Include experimental TDB SAM support (default=no)],
|
||||||
[ case "$withval" in
|
[ case "$withval" in
|
||||||
yes)
|
yes)
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(WITH_TDB_SAM)
|
AC_DEFINE(WITH_TDB_SAM)
|
||||||
|
with_smbpasswd_sam=no
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
@@ -1801,6 +1813,25 @@ AC_ARG_WITH(nisplussam,
|
|||||||
esac ],
|
esac ],
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
################################################
|
||||||
|
# This test should come last because the
|
||||||
|
# smbpasswd SAM is only used if another format
|
||||||
|
# has not been defined
|
||||||
|
AC_MSG_CHECKING(whether to use traditional smbpasswd file)
|
||||||
|
if test $with_smbpasswd_sam = yes; then
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(WITH_SMBPASSWD_SAM)
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
|
fi
|
||||||
|
|
||||||
|
########################################################################################
|
||||||
|
##
|
||||||
|
## END OF TESTS FOR SAM BACKENDS.
|
||||||
|
##
|
||||||
|
########################################################################################
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
# check for a NISPLUS_HOME support
|
# check for a NISPLUS_HOME support
|
||||||
AC_MSG_CHECKING(whether to use NISPLUS_HOME)
|
AC_MSG_CHECKING(whether to use NISPLUS_HOME)
|
||||||
|
Reference in New Issue
Block a user