1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00

merges from 2.2

(This used to be commit b619458dde)
This commit is contained in:
Gerald Carter 2001-09-14 15:33:09 +00:00
parent bd7595ec37
commit a3203a7b16
4 changed files with 735 additions and 765 deletions

1491
source3/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1732,8 +1732,7 @@ AC_ARG_WITH(tdbsam,
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_TDBPWD)
# AC_MSG_ERROR([TDB password database not supported in this version.])
AC_DEFINE(WITH_TDBSAM)
;;
*)
AC_MSG_RESULT(no)

View File

@ -124,7 +124,7 @@
#undef WITH_SSL
#undef WITH_LDAP
#undef WITH_NISPLUS
#undef WITH_TDBPWD
#undef WITH_TDBSAM
#undef WITH_PAM
#undef WITH_NISPLUS_HOME
#undef WITH_AUTOMOUNT

View File

@ -21,7 +21,7 @@
#include "includes.h"
#ifdef WITH_TDBPWD
#ifdef WITH_TDBSAM
#define PDB_VERSION "20010830"
#define PASSDB_FILE_NAME "/passdb.tdb"
@ -817,4 +817,4 @@ BOOL pdb_add_sam_account (SAM_ACCOUNT *newpwd)
#else
/* Do *NOT* make this function static. It breaks the compile on gcc. JRA */
void samtdb_dummy_function(void) { } /* stop some compilers complaining */
#endif /* WITH_TDBPWD */
#endif /* WITH_TDBSAM */