[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Tue Mar 17 07:07:02 MDT 2015


The branch, master has been updated
       via  74e52a4 lib: Remove ccan
       via  867f0a8 texpect: Do not depend on ccan
       via  0c47bdf source3: Remove ccan-hash dependency
       via  f686db8 source3: Replace ccan hash calls with tdb_jenkins_hash
       via  1016439 smbd: Remove an unused #include
       via  de811f1 lib: Remove tdb_compat
       via  cf368cb lib: Remove tdb_fetch_compat
       via  f199e0e lib: Remove tdb_errorstr_compat
       via  98a4037 Remove tdb_[first|next]key_compat
       via  47795ae lib: Remove tdb_open_compat
       via  e3e0af1 lib: Remove ntdb
       via  9dfc521 waf: Do not recurse into ntdb
       via  31c3806 dbwrap: Remove a ntdb reference
       via  fe81b50 Remove ntdb protection from db_open_tdb
       via  d08426a Remove ntdb protection from tdb_wrap
       via  23390f1 Docs: Remove some ntdb references
       via  9fbc2e5 python: Remove ntdb references
       via  334015e autobuild: Remove ntdb target
       via  8905293 Remove ntdb from scripts
       via  e3d2e6a param: Remove "use ntdb" reference
       via  959f81a Revert "Samba3-HOWTO: mention NTDB."
       via  de2c8dd param: Remove "use ntdb"
       via  6c1d39c lib: Remove unused util_ntdb.[ch]
       via  8ba7bee dbwrap: Remove dbwrap_ntdb
       via  460a6e1 dbwrap: Remove ntdb logic from dbwrap_local_open
       via  d699e1d lib: Remove "use_ntdb" param from secrets_init_path
       via  b081179 Remove callers of lp_use_ntdb
       via  9943691 samdb: Ignore ntdb in secrets_tdb_sync
      from  908b1f9 passdb: Fix the O3 developer build

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 74e52a42a7b61d9d311d86d9896e4a2b73740fb9
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 15:07:54 2015 +0000

    lib: Remove ccan
    
    The only component, that really used more than tiny bits of ccan was ntdb. Now
    that ntdb is gone, ccan is not required anymore either.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Mar 17 14:06:15 CET 2015 on sn-devel-104

commit 867f0a80a828d965fc855cef31f0724550b01b4f
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 15:07:38 2015 +0000

    texpect: Do not depend on ccan
    
    texpect is the only remaining user of ccan code. Copy in the two routines
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 0c47bdf295455034c414ba6f42fa9b8988e2ca2c
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 15:03:22 2015 +0000

    source3: Remove ccan-hash dependency
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit f686db87a4059aa587bf45391162134b19181eec
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 15:00:58 2015 +0000

    source3: Replace ccan hash calls with tdb_jenkins_hash
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 1016439153ccbd1687927819b107bb7b73a5d750
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 14:50:01 2015 +0000

    smbd: Remove an unused #include
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit de811f14af2083febdea5a1310f78407115168f6
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 14:40:16 2015 +0000

    lib: Remove tdb_compat
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit cf368cbdc5f1b6ee1f831e3a90d8d77ef8d317ed
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 14:23:17 2015 +0000

    lib: Remove tdb_fetch_compat
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit f199e0ebfc6625406559864da4c18c038e903107
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 14:19:02 2015 +0000

    lib: Remove tdb_errorstr_compat
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 98a4037df4468ccaed69551890fac0b0916048bd
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 14:14:24 2015 +0000

    Remove tdb_[first|next]key_compat
    
    This is essentially a revert of 3a8faefd.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 47795aef9dcead38a6365d655f82262cdca710c8
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:56:09 2015 +0000

    lib: Remove tdb_open_compat
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit e3e0af14e176e69743223ebb43f21e4eef420ba2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:17:15 2015 +0000

    lib: Remove ntdb
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 9dfc521642d643b4e2e2537596021554382a2efa
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:16:49 2015 +0000

    waf: Do not recurse into ntdb
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 31c3806a1c62588f111cb174ffbdbdc27fc563b2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:40:43 2015 +0000

    dbwrap: Remove a ntdb reference
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit fe81b50d6547707a5ba216629b5af15a6299877c
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:39:40 2015 +0000

    Remove ntdb protection from db_open_tdb
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit d08426a1588e236b15e2cd30a15f2671b8d19391
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:39:12 2015 +0000

    Remove ntdb protection from tdb_wrap
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 23390f1fee86346642f44a3eb9c11e43f76c56c7
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:34:15 2015 +0000

    Docs: Remove some ntdb references
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 9fbc2e50188fc0f5b075eb49b983204df04b3751
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:27:49 2015 +0000

    python: Remove ntdb references
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 334015ebca42262668c82fbc9f5b2d25b0100b65
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:25:38 2015 +0000

    autobuild: Remove ntdb target
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 89052936aee34af841fea230c92e133ad28e67c6
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:18:34 2015 +0000

    Remove ntdb from scripts
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit e3d2e6a288e35cf2037a3714ef3caf3933390d24
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:10:12 2015 +0000

    param: Remove "use ntdb" reference
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 959f81ad1b0e2c2bd4c8729cdf0617ef905f4cc0
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:09:01 2015 +0000

    Revert "Samba3-HOWTO: mention NTDB."
    
    This reverts commit c5bd2ae338c0b67304ee253e3b5139b50cc1d0e5.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit de2c8dd75592a5a703e3874a04ecc4cd997f8320
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:07:31 2015 +0000

    param: Remove "use ntdb"
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 6c1d39c3283657aa848f96346d3fca2d5add3748
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:05:25 2015 +0000

    lib: Remove unused util_ntdb.[ch]
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 8ba7bee6134ddce8f6fafd2f15fc3a974795aa22
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 13:03:07 2015 +0000

    dbwrap: Remove dbwrap_ntdb
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 460a6e11d97195fc9eb0fc2ba823fa6d4edf2ea0
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 12:57:33 2015 +0000

    dbwrap: Remove ntdb logic from dbwrap_local_open
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit d699e1db803df3ace797742c3af33fabbfd14cf3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 12:45:12 2015 +0000

    lib: Remove "use_ntdb" param from secrets_init_path
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit b08117976d1d0a9e42b860f8971a4d9bc639bf4b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 12 12:39:37 2015 +0000

    Remove callers of lp_use_ntdb
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 9943691093cc03a5b25a945041dd43e52929033d
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 13 14:34:36 2015 +0000

    samdb: Ignore ntdb in secrets_tdb_sync
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 .ycm_extra_conf.py                                 |    1 -
 buildtools/wafsamba/samba3.py                      |    2 +-
 docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml         |   59 +-
 docs-xml/manpages/net.8.xml                        |    2 +-
 docs-xml/manpages/smbpasswd.8.xml                  |    4 +-
 docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml   |    2 +-
 .../smbdotconf/domain/machinepasswordtimeout.xml   |    2 +-
 docs-xml/smbdotconf/ldap/ldapadmindn.xml           |    2 +-
 docs-xml/smbdotconf/security/kerberosmethod.xml    |    4 +-
 docs-xml/smbdotconf/security/privatedir.xml        |    2 +-
 docs-xml/smbdotconf/tuning/usentdb.xml             |   23 -
 lib/ccan/README                                    |    9 -
 lib/ccan/array_size/_info                          |   46 -
 lib/ccan/array_size/array_size.h                   |   25 -
 .../array_size/test/compile_fail-function-param.c  |   24 -
 lib/ccan/array_size/test/compile_fail.c            |   14 -
 lib/ccan/array_size/test/run.c                     |   33 -
 lib/ccan/asearch/LICENSE                           |  508 ----
 lib/ccan/asearch/_info                             |   58 -
 lib/ccan/asearch/asearch.h                         |   38 -
 .../asearch/test/compile_fail-return-value-const.c |   25 -
 lib/ccan/asearch/test/compile_fail-return-value.c  |   22 -
 lib/ccan/asearch/test/run-strings.c                |   22 -
 lib/ccan/asearch/test/run.c                        |   40 -
 lib/ccan/build_assert/LICENSE                      |  508 ----
 lib/ccan/build_assert/_info                        |   49 -
 lib/ccan/build_assert/build_assert.h               |   39 -
 lib/ccan/build_assert/test/compile_fail-expr.c     |   10 -
 lib/ccan/build_assert/test/compile_fail.c          |    9 -
 lib/ccan/build_assert/test/compile_ok.c            |    7 -
 .../build_assert/test/run-BUILD_ASSERT_OR_ZERO.c   |    9 -
 lib/ccan/build_assert/test/run-EXPR_BUILD_ASSERT.c |    9 -
 lib/ccan/cast/LICENSE                              |  510 ----
 lib/ccan/cast/_info                                |   84 -
 lib/ccan/cast/cast.h                               |  134 -
 lib/ccan/cast/test/compile_fail-cast_const.c       |   29 -
 lib/ccan/cast/test/compile_fail-cast_const2.c      |   29 -
 lib/ccan/cast/test/compile_fail-cast_const3.c      |   29 -
 .../cast/test/compile_fail-cast_signed-const.c     |   22 -
 .../cast/test/compile_fail-cast_signed-sizesame.c  |   29 -
 lib/ccan/cast/test/compile_fail-cast_signed.c      |   17 -
 lib/ccan/cast/test/compile_fail-cast_static-2.c    |   23 -
 lib/ccan/cast/test/compile_fail-cast_static-3.c    |   21 -
 lib/ccan/cast/test/compile_fail-cast_static.c      |   23 -
 lib/ccan/cast/test/compile_ok-cast_void.c          |   12 -
 lib/ccan/cast/test/compile_ok-static.c             |   10 -
 lib/ccan/check_type/_info                          |   33 -
 lib/ccan/check_type/check_type.h                   |   63 -
 lib/ccan/check_type/test/compile_fail-check_type.c |    9 -
 .../test/compile_fail-check_type_unsigned.c        |   14 -
 .../test/compile_fail-check_types_match.c          |   10 -
 lib/ccan/check_type/test/run.c                     |   22 -
 lib/ccan/compiler/LICENSE                          |  165 --
 lib/ccan/compiler/_info                            |   64 -
 lib/ccan/compiler/compiler.h                       |  216 --
 lib/ccan/compiler/test/compile_fail-printf.c       |   22 -
 lib/ccan/compiler/test/run-is_compile_constant.c   |   15 -
 lib/ccan/container_of/_info                        |   63 -
 lib/ccan/container_of/container_of.h               |  108 -
 lib/ccan/container_of/test/compile_fail-bad-type.c |   22 -
 lib/ccan/container_of/test/compile_fail-types.c    |   22 -
 .../container_of/test/compile_fail-var-types.c     |   25 -
 lib/ccan/container_of/test/run.c                   |   26 -
 lib/ccan/endian/LICENSE                            |  508 ----
 lib/ccan/endian/_info                              |   53 -
 lib/ccan/endian/endian.h                           |  227 --
 lib/ccan/endian/test/run.c                         |  106 -
 lib/ccan/err/.depends                              |    1 -
 lib/ccan/err/_info                                 |   41 -
 lib/ccan/err/err.c                                 |   64 -
 lib/ccan/err/err.h                                 |   87 -
 lib/ccan/err/test/run.c                            |  153 --
 lib/ccan/failtest/LICENSE                          |  165 --
 lib/ccan/failtest/_info                            |   81 -
 lib/ccan/failtest/failtest.c                       | 1732 -------------
 lib/ccan/failtest/failtest.d                       |   70 -
 lib/ccan/failtest/failtest.h                       |  258 --
 lib/ccan/failtest/failtest_override.h              |   91 -
 lib/ccan/failtest/failtest_proto.h                 |   33 -
 lib/ccan/failtest/failtest_undo.h                  |   49 -
 lib/ccan/failtest/test/run-failpath.c              |   39 -
 lib/ccan/failtest/test/run-history.c               |  183 --
 lib/ccan/failtest/test/run-locking.c               |  134 -
 lib/ccan/failtest/test/run-malloc.c                |  116 -
 lib/ccan/failtest/test/run-open.c                  |   72 -
 lib/ccan/failtest/test/run-with-fdlimit.c          |   51 -
 lib/ccan/failtest/test/run-write.c                 |   51 -
 lib/ccan/hash/_info                                |   31 -
 lib/ccan/hash/hash.c                               |  925 -------
 lib/ccan/hash/hash.h                               |  312 ---
 lib/ccan/hash/test/api-hash_stable.c               |  300 ---
 lib/ccan/hash/test/run.c                           |  149 --
 lib/ccan/htable/LICENSE                            |  510 ----
 lib/ccan/htable/_info                              |  115 -
 lib/ccan/htable/htable.c                           |  264 --
 lib/ccan/htable/htable.h                           |  176 --
 lib/ccan/htable/htable_type.h                      |  103 -
 lib/ccan/htable/test/run-size.c                    |   36 -
 lib/ccan/htable/test/run-type.c                    |  175 --
 lib/ccan/htable/test/run.c                         |  188 --
 lib/ccan/htable/tools/Makefile                     |   20 -
 lib/ccan/htable/tools/hsearchspeed.c               |  103 -
 lib/ccan/htable/tools/speed.c                      |  376 ---
 lib/ccan/htable/tools/stringspeed.c                |  246 --
 lib/ccan/ilog/LICENSE                              |  508 ----
 lib/ccan/ilog/_info                                |   47 -
 lib/ccan/ilog/ilog.c                               |  140 -
 lib/ccan/ilog/ilog.h                               |  151 --
 lib/ccan/ilog/test/run-out-of-line.c               |   65 -
 lib/ccan/ilog/test/run.c                           |   60 -
 lib/ccan/likely/LICENSE                            |  508 ----
 lib/ccan/likely/_info                              |   45 -
 lib/ccan/likely/likely.c                           |  136 -
 lib/ccan/likely/likely.h                           |  121 -
 lib/ccan/likely/test/run-debug.c                   |  100 -
 lib/ccan/likely/test/run.c                         |   30 -
 lib/ccan/list/.namespacize                         |   34 -
 lib/ccan/list/LICENSE                              |  508 ----
 lib/ccan/list/_info                                |   70 -
 lib/ccan/list/list.c                               |   43 -
 lib/ccan/list/list.d                               |   27 -
 lib/ccan/list/list.h                               |  469 ----
 lib/ccan/list/test/compile_ok-constant.c           |   49 -
 lib/ccan/list/test/helper.c                        |   54 -
 lib/ccan/list/test/helper.h                        |    7 -
 lib/ccan/list/test/run-check-corrupt.c             |   89 -
 lib/ccan/list/test/run-list_del_from-assert.c      |   36 -
 lib/ccan/list/test/run-single-eval.c               |  168 --
 lib/ccan/list/test/run-with-debug.c                |    3 -
 lib/ccan/list/test/run.c                           |  200 --
 lib/ccan/read_write_all/LICENSE                    |  508 ----
 lib/ccan/read_write_all/_info                      |   44 -
 lib/ccan/read_write_all/read_write_all.c           |   38 -
 lib/ccan/read_write_all/read_write_all.d           |   19 -
 lib/ccan/read_write_all/read_write_all.h           |   10 -
 lib/ccan/read_write_all/test/run-read_all.c        |   76 -
 lib/ccan/read_write_all/test/run-write_all.c       |   68 -
 lib/ccan/str/_info                                 |   52 -
 lib/ccan/str/debug.c                               |  107 -
 lib/ccan/str/str.c                                 |   12 -
 lib/ccan/str/str.h                                 |  201 --
 lib/ccan/str/str_debug.h                           |   29 -
 lib/ccan/str/test/compile_fail-isalnum.c           |   22 -
 lib/ccan/str/test/compile_fail-isalpha.c           |   22 -
 lib/ccan/str/test/compile_fail-isascii.c           |   22 -
 lib/ccan/str/test/compile_fail-isblank.c           |   26 -
 lib/ccan/str/test/compile_fail-iscntrl.c           |   22 -
 lib/ccan/str/test/compile_fail-isdigit.c           |   22 -
 lib/ccan/str/test/compile_fail-islower.c           |   22 -
 lib/ccan/str/test/compile_fail-isprint.c           |   22 -
 lib/ccan/str/test/compile_fail-ispunct.c           |   22 -
 lib/ccan/str/test/compile_fail-isspace.c           |   22 -
 lib/ccan/str/test/compile_fail-isupper.c           |   22 -
 lib/ccan/str/test/compile_fail-isxdigit.c          |   22 -
 lib/ccan/str/test/compile_fail-strchr.c            |   18 -
 lib/ccan/str/test/compile_fail-strrchr.c           |   18 -
 lib/ccan/str/test/compile_fail-strstr.c            |   18 -
 lib/ccan/str/test/debug.c                          |    5 -
 lib/ccan/str/test/run.c                            |  106 -
 lib/ccan/strset/tools/Makefile                     |   11 -
 lib/ccan/strset/tools/cbspeed.c                    |  590 -----
 lib/ccan/strset/tools/speed.c                      |  243 --
 lib/ccan/tally/LICENSE                             |  165 --
 lib/ccan/tally/_info                               |   58 -
 lib/ccan/tally/tally.c                             |  521 ----
 lib/ccan/tally/tally.h                             |  105 -
 lib/ccan/tally/test/run-bucket_of.c                |   71 -
 lib/ccan/tally/test/run-divlu64.c                  |   31 -
 lib/ccan/tally/test/run-histogram.c                |  108 -
 lib/ccan/tally/test/run-mean.c                     |   30 -
 lib/ccan/tally/test/run-median.c                   |   46 -
 lib/ccan/tally/test/run-min-max.c                  |   21 -
 lib/ccan/tally/test/run-mode.c                     |   46 -
 lib/ccan/tally/test/run-renormalize.c              |   26 -
 lib/ccan/tally/test/run-total.c                    |   56 -
 lib/ccan/tcon/_info                                |   74 -
 lib/ccan/tcon/tcon.h                               |  115 -
 lib/ccan/tcon/test/compile_fail-tcon_cast.c        |   29 -
 lib/ccan/tcon/test/compile_fail.c                  |   25 -
 lib/ccan/tcon/test/compile_ok-void.c               |   21 -
 lib/ccan/tcon/test/compile_ok.c                    |   27 -
 lib/ccan/time/LICENSE                              |   17 -
 lib/ccan/time/_info                                |   47 -
 lib/ccan/time/test/run.c                           |  111 -
 lib/ccan/time/time.c                               |  108 -
 lib/ccan/time/time.d                               |   25 -
 lib/ccan/time/time.h                               |  184 --
 lib/ccan/tlist/LICENSE                             |  165 --
 lib/ccan/tlist/_info                               |   74 -
 lib/ccan/tlist/test/compile_fail-tlist_add.c       |   35 -
 lib/ccan/tlist/test/compile_fail-tlist_add_tail.c  |   35 -
 lib/ccan/tlist/test/compile_fail-tlist_del_from.c  |   34 -
 lib/ccan/tlist/test/compile_fail-tlist_for_each.c  |   34 -
 .../tlist/test/compile_fail-tlist_for_each_safe.c  |   33 -
 lib/ccan/tlist/test/compile_fail-tlist_tail.c      |   31 -
 lib/ccan/tlist/test/compile_fail-tlist_top.c       |   31 -
 lib/ccan/tlist/test/run.c                          |  147 --
 lib/ccan/tlist/tlist.h                             |  265 --
 lib/ccan/typesafe_cb/LICENSE                       |  508 ----
 lib/ccan/typesafe_cb/_info                         |  151 --
 .../typesafe_cb/test/compile_fail-cast_if_any.c    |   42 -
 .../test/compile_fail-cast_if_type-promotable.c    |   23 -
 .../typesafe_cb/test/compile_fail-cast_if_type.c   |   25 -
 .../test/compile_fail-typesafe_cb-int.c            |   27 -
 .../typesafe_cb/test/compile_fail-typesafe_cb.c    |   34 -
 .../test/compile_fail-typesafe_cb_cast-multi.c     |   43 -
 .../test/compile_fail-typesafe_cb_cast.c           |   25 -
 .../test/compile_fail-typesafe_cb_exact.c          |   33 -
 .../test/compile_fail-typesafe_cb_postargs.c       |   27 -
 .../test/compile_fail-typesafe_cb_preargs.c        |   28 -
 lib/ccan/typesafe_cb/test/compile_ok-cast_if_any.c |   41 -
 .../typesafe_cb/test/compile_ok-typesafe_cb-NULL.c |   17 -
 .../test/compile_ok-typesafe_cb-const.c            |   50 -
 .../test/compile_ok-typesafe_cb-undefined.c        |   49 -
 .../typesafe_cb/test/compile_ok-typesafe_cb-vars.c |   52 -
 .../test/compile_ok-typesafe_cb-volatile.c         |   47 -
 .../typesafe_cb/test/compile_ok-typesafe_cb_cast.c |   41 -
 .../test/compile_ok-typesafe_cb_def-const.c        |   46 -
 lib/ccan/typesafe_cb/test/run.c                    |  109 -
 lib/ccan/typesafe_cb/typesafe_cb.h                 |  134 -
 lib/ccan/wscript                                   |  139 -
 lib/dbwrap/dbwrap.h                                |    6 +-
 lib/dbwrap/dbwrap_local_open.c                     |  187 +-
 lib/dbwrap/dbwrap_ntdb.c                           |  585 -----
 lib/dbwrap/dbwrap_ntdb.h                           |   36 -
 lib/dbwrap/dbwrap_tdb.c                            |    7 -
 lib/dbwrap/wscript_build                           |    6 +-
 lib/ntdb/ABI/ntdb-0.9.sigs                         |   38 -
 lib/ntdb/ABI/ntdb-1.0.sigs                         |   38 -
 lib/ntdb/LICENSE                                   |  165 --
 lib/ntdb/Makefile                                  |   67 -
 lib/ntdb/check.c                                   |  726 ------
 lib/ntdb/configure                                 |   21 -
 lib/ntdb/doc/TDB_porting.txt                       |  483 ----
 lib/ntdb/doc/design.lyx                            | 2727 --------------------
 lib/ntdb/doc/design.pdf                            |  Bin 191943 -> 0 bytes
 lib/ntdb/doc/design.txt                            | 1270 ---------
 lib/ntdb/free.c                                    |  972 -------
 lib/ntdb/hash.c                                    |  624 -----
 lib/ntdb/io.c                                      |  750 ------
 lib/ntdb/lock.c                                    |  886 -------
 lib/ntdb/man/ntdb.3.xml                            |  132 -
 lib/ntdb/man/ntdbbackup.8.xml                      |  150 --
 lib/ntdb/man/ntdbdump.8.xml                        |   93 -
 lib/ntdb/man/ntdbrestore.8.xml                     |   74 -
 lib/ntdb/man/ntdbtool.8.xml                        |  247 --
 lib/ntdb/ntdb.c                                    |  601 -----
 lib/ntdb/ntdb.h                                    |  947 -------
 lib/ntdb/ntdb.pc.in                                |   11 -
 lib/ntdb/open.c                                    |  911 -------
 lib/ntdb/private.h                                 |  677 -----
 lib/ntdb/pyntdb.c                                  |  643 -----
 lib/ntdb/summary.c                                 |  321 ---
 lib/ntdb/test/api-12-store.c                       |   55 -
 lib/ntdb/test/api-13-delete.c                      |  201 --
 lib/ntdb/test/api-14-exists.c                      |   52 -
 lib/ntdb/test/api-16-wipe_all.c                    |   44 -
 lib/ntdb/test/api-20-alloc-attr.c                  |  106 -
 lib/ntdb/test/api-21-parse_record.c                |   66 -
 lib/ntdb/test/api-55-transaction.c                 |   71 -
 lib/ntdb/test/api-60-noop-transaction.c            |   55 -
 lib/ntdb/test/api-80-tdb_fd.c                      |   30 -
 lib/ntdb/test/api-81-seqnum.c                      |   68 -
 lib/ntdb/test/api-82-lockattr.c                    |  237 --
 lib/ntdb/test/api-83-openhook.c                    |  103 -
 lib/ntdb/test/api-91-get-stats.c                   |   57 -
 lib/ntdb/test/api-92-get-set-readonly.c            |  105 -
 lib/ntdb/test/api-93-repack.c                      |   79 -
 lib/ntdb/test/api-94-expand-during-parse.c         |   86 -
 lib/ntdb/test/api-95-read-only-during-parse.c      |   92 -
 lib/ntdb/test/api-add-remove-flags.c               |   87 -
 lib/ntdb/test/api-check-callback.c                 |   86 -
 lib/ntdb/test/api-firstkey-nextkey.c               |  157 --
 lib/ntdb/test/api-fork-test.c                      |  194 --
 lib/ntdb/test/api-locktimeout.c                    |  189 --
 lib/ntdb/test/api-missing-entries.c                |   42 -
 lib/ntdb/test/api-open-multiple-times.c            |   86 -
 lib/ntdb/test/api-record-expand.c                  |   49 -
 lib/ntdb/test/api-simple-delete.c                  |   38 -
 lib/ntdb/test/api-summary.c                        |   55 -
 lib/ntdb/test/external-agent.c                     |  261 --
 lib/ntdb/test/external-agent.h                     |   51 -
 lib/ntdb/test/failtest_helper.c                    |   99 -
 lib/ntdb/test/failtest_helper.h                    |   18 -
 lib/ntdb/test/helpapi-external-agent.c             |    7 -
 lib/ntdb/test/helprun-external-agent.c             |    7 -
 lib/ntdb/test/helprun-layout.c                     |  362 ---
 lib/ntdb/test/layout.h                             |   79 -
 lib/ntdb/test/lock-tracking.c                      |  147 --
 lib/ntdb/test/lock-tracking.h                      |   25 -
 lib/ntdb/test/logging.c                            |   30 -
 lib/ntdb/test/logging.h                            |   17 -
 lib/ntdb/test/no-fsync.h                           |    6 -
 lib/ntdb/test/ntdb-source.h                        |   11 -
 lib/ntdb/test/python-api.py                        |  154 --
 lib/ntdb/test/run-001-encode.c                     |   39 -
 lib/ntdb/test/run-001-fls.c                        |   33 -
 lib/ntdb/test/run-01-new_database.c                |   40 -
 lib/ntdb/test/run-02-expand.c                      |   68 -
 lib/ntdb/test/run-03-coalesce.c                    |  178 --
 lib/ntdb/test/run-04-basichash.c                   |  321 ---
 lib/ntdb/test/run-05-readonly-open.c               |   79 -
 lib/ntdb/test/run-10-simple-store.c                |   65 -
 lib/ntdb/test/run-11-simple-fetch.c                |   65 -
 lib/ntdb/test/run-12-check.c                       |   52 -
 lib/ntdb/test/run-15-append.c                      |  130 -
 lib/ntdb/test/run-25-hashoverload.c                |   93 -
 lib/ntdb/test/run-30-exhaust-before-expand.c       |   76 -
 lib/ntdb/test/run-35-convert.c                     |   64 -
 lib/ntdb/test/run-50-multiple-freelists.c          |   70 -
 lib/ntdb/test/run-56-open-during-transaction.c     |  165 --
 lib/ntdb/test/run-57-die-during-transaction.c      |  321 ---
 lib/ntdb/test/run-64-bit-tdb.c                     |   88 -
 lib/ntdb/test/run-90-get-set-attributes.c          |  161 --
 lib/ntdb/test/run-capabilities.c                   |  283 --
 lib/ntdb/test/run-expand-in-transaction.c          |   47 -
 lib/ntdb/test/run-features.c                       |   62 -
 lib/ntdb/test/run-lockall.c                        |   74 -
 lib/ntdb/test/run-remap-in-read_traverse.c         |   57 -
 lib/ntdb/test/run-seed.c                           |   61 -
 lib/ntdb/test/run-tdb_errorstr.c                   |   52 -
 lib/ntdb/test/run-tdb_foreach.c                    |   90 -
 lib/ntdb/test/run-traverse.c                       |  203 --
 lib/ntdb/test/tap-interface.c                      |    3 -
 lib/ntdb/test/tap-interface.h                      |   42 -
 lib/ntdb/tools/Makefile                            |   16 -
 lib/ntdb/tools/growtdb-bench.c                     |  127 -
 lib/ntdb/tools/mkntdb.c                            |   29 -
 lib/ntdb/tools/ntdbbackup.c                        |  340 ---
 lib/ntdb/tools/ntdbdump.c                          |  110 -
 lib/ntdb/tools/ntdbrestore.c                       |  242 --
 lib/ntdb/tools/ntdbtool.c                          |  794 ------
 lib/ntdb/tools/ntdbtorture.c                       |  535 ----
 lib/ntdb/tools/speed.c                             |  439 ----
 lib/ntdb/transaction.c                             | 1317 ----------
 lib/ntdb/traverse.c                                |  100 -
 lib/ntdb/wscript                                   |  287 --
 lib/param/param.h                                  |    4 +-
 lib/param/param_table.c                            |    9 -
 lib/param/util.c                                   |   14 +-
 lib/tdb/man/tdbbackup.8.xml                        |    5 -
 lib/tdb_compat/tdb_compat.c                        |    2 -
 lib/tdb_compat/tdb_compat.h                        |   60 -
 lib/tdb_compat/wscript                             |   16 -
 lib/tdb_wrap/tdb_wrap.c                            |    9 -
 lib/texpect/texpect.c                              |   28 +-
 lib/texpect/wscript                                |    2 +-
 lib/util/util_ntdb.c                               |  346 ---
 lib/util/util_ntdb.h                               |  135 -
 lib/util/wscript_build                             |    8 -
 python/samba/samba3/__init__.py                    |    8 +-
 python/samba/tests/provision.py                    |    3 -
 script/autobuild.py                                |   19 +-
 source3/.clang_complete                            |    1 -
 source3/groupdb/mapping.c                          |    2 +-
 source3/include/ctdbd_conn.h                       |    2 +-
 source3/include/printing.h                         |    2 +-
 source3/include/secrets.h                          |    2 +-
 source3/include/util_tdb.h                         |    2 +-
 source3/lib/ctdbd_conn.c                           |   18 -
 source3/lib/dbwrap/dbwrap_ctdb.c                   |   24 +-
 source3/lib/eventlog/eventlog.c                    |    4 +-
 source3/lib/eventlog/eventlog.h                    |    2 +-
 source3/lib/gencache.c                             |   14 +-
 source3/lib/messages_ctdbd.c                       |   18 -
 source3/lib/tdb_validate.h                         |    2 +-
 source3/lib/util.c                                 |    8 +-
 source3/lib/util_tdb.c                             |    5 +-
 source3/libsmb/smb_share_modes.c                   |   27 +-
 source3/modules/vfs_posix_eadb.c                   |    2 +-
 source3/modules/vfs_shadow_copy2.c                 |    5 +-
 source3/nmbd/nmbd_winsserver.c                     |    2 +-
 source3/passdb/py_passdb.c                         |    2 +-
 source3/passdb/secrets.c                           |    7 +-
 source3/passdb/wscript_build                       |    4 +-
 source3/printing/nt_printing_migrate_internal.c    |   14 +-
 source3/printing/nt_printing_tdb.c                 |   20 +-
 source3/printing/printing.c                        |   28 +-
 source3/printing/tests/vlp.c                       |    4 +-
 source3/registry/reg_perfcount.c                   |   16 +-
 source3/smbd/files.c                               |    5 +-
 source3/smbd/globals.c                             |    2 +-
 source3/smbd/smb2_ioctl_network_fs.c               |    1 -
 source3/smbd/smbXsrv_open.c                        |    5 +-
 source3/smbd/statcache.c                           |    2 +-
 source3/torture/mangle_test.c                      |    2 +-
 source3/utils/net_printing.c                       |   22 +-
 source3/winbindd/winbindd_cache.c                  |   14 +-
 source3/wscript_build                              |   17 +-
 source4/cluster/local.c                            |    5 +-
 source4/dsdb/samdb/ldb_modules/schema_load.c       |    6 +-
 source4/dsdb/samdb/ldb_modules/secrets_tdb_sync.c  |   10 +-
 source4/ntvfs/posix/python/pyposix_eadb.c          |    2 +-
 source4/ntvfs/posix/python/pyxattr_tdb.c           |    2 +-
 source4/ntvfs/posix/vfs_posix.c                    |    2 +-
 source4/ntvfs/posix/wscript_build                  |    2 +-
 source4/torture/basic/mangle_test.c                |    4 +-
 source4/torture/local/dbspeed.c                    |    6 +-
 wscript                                            |    5 +-
 wscript_build                                      |    4 -
 400 files changed, 223 insertions(+), 49006 deletions(-)
 delete mode 100644 docs-xml/smbdotconf/tuning/usentdb.xml
 delete mode 100644 lib/ccan/README
 delete mode 100644 lib/ccan/array_size/_info
 delete mode 100644 lib/ccan/array_size/array_size.h
 delete mode 100644 lib/ccan/array_size/test/compile_fail-function-param.c
 delete mode 100644 lib/ccan/array_size/test/compile_fail.c
 delete mode 100644 lib/ccan/array_size/test/run.c
 delete mode 100644 lib/ccan/asearch/LICENSE
 delete mode 100644 lib/ccan/asearch/_info
 delete mode 100644 lib/ccan/asearch/asearch.h
 delete mode 100644 lib/ccan/asearch/test/compile_fail-return-value-const.c
 delete mode 100644 lib/ccan/asearch/test/compile_fail-return-value.c
 delete mode 100644 lib/ccan/asearch/test/run-strings.c
 delete mode 100644 lib/ccan/asearch/test/run.c
 delete mode 100644 lib/ccan/build_assert/LICENSE
 delete mode 100644 lib/ccan/build_assert/_info
 delete mode 100644 lib/ccan/build_assert/build_assert.h
 delete mode 100644 lib/ccan/build_assert/test/compile_fail-expr.c
 delete mode 100644 lib/ccan/build_assert/test/compile_fail.c
 delete mode 100644 lib/ccan/build_assert/test/compile_ok.c
 delete mode 100644 lib/ccan/build_assert/test/run-BUILD_ASSERT_OR_ZERO.c
 delete mode 100644 lib/ccan/build_assert/test/run-EXPR_BUILD_ASSERT.c
 delete mode 100644 lib/ccan/cast/LICENSE
 delete mode 100644 lib/ccan/cast/_info
 delete mode 100644 lib/ccan/cast/cast.h
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_const.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_const2.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_const3.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_signed-const.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_signed-sizesame.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_signed.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_static-2.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_static-3.c
 delete mode 100644 lib/ccan/cast/test/compile_fail-cast_static.c
 delete mode 100644 lib/ccan/cast/test/compile_ok-cast_void.c
 delete mode 100644 lib/ccan/cast/test/compile_ok-static.c
 delete mode 100644 lib/ccan/check_type/_info
 delete mode 100644 lib/ccan/check_type/check_type.h
 delete mode 100644 lib/ccan/check_type/test/compile_fail-check_type.c
 delete mode 100644 lib/ccan/check_type/test/compile_fail-check_type_unsigned.c
 delete mode 100644 lib/ccan/check_type/test/compile_fail-check_types_match.c
 delete mode 100644 lib/ccan/check_type/test/run.c
 delete mode 100644 lib/ccan/compiler/LICENSE
 delete mode 100644 lib/ccan/compiler/_info
 delete mode 100644 lib/ccan/compiler/compiler.h
 delete mode 100644 lib/ccan/compiler/test/compile_fail-printf.c
 delete mode 100644 lib/ccan/compiler/test/run-is_compile_constant.c
 delete mode 100644 lib/ccan/container_of/_info
 delete mode 100644 lib/ccan/container_of/container_of.h
 delete mode 100644 lib/ccan/container_of/test/compile_fail-bad-type.c
 delete mode 100644 lib/ccan/container_of/test/compile_fail-types.c
 delete mode 100644 lib/ccan/container_of/test/compile_fail-var-types.c
 delete mode 100644 lib/ccan/container_of/test/run.c
 delete mode 100644 lib/ccan/endian/LICENSE
 delete mode 100644 lib/ccan/endian/_info
 delete mode 100644 lib/ccan/endian/endian.h
 delete mode 100644 lib/ccan/endian/test/run.c
 delete mode 100644 lib/ccan/err/.depends
 delete mode 100644 lib/ccan/err/_info
 delete mode 100644 lib/ccan/err/err.c
 delete mode 100644 lib/ccan/err/err.h
 delete mode 100644 lib/ccan/err/test/run.c
 delete mode 100644 lib/ccan/failtest/LICENSE
 delete mode 100644 lib/ccan/failtest/_info
 delete mode 100644 lib/ccan/failtest/failtest.c
 delete mode 100644 lib/ccan/failtest/failtest.d
 delete mode 100644 lib/ccan/failtest/failtest.h
 delete mode 100644 lib/ccan/failtest/failtest_override.h
 delete mode 100644 lib/ccan/failtest/failtest_proto.h
 delete mode 100644 lib/ccan/failtest/failtest_undo.h
 delete mode 100644 lib/ccan/failtest/test/run-failpath.c
 delete mode 100644 lib/ccan/failtest/test/run-history.c
 delete mode 100644 lib/ccan/failtest/test/run-locking.c
 delete mode 100644 lib/ccan/failtest/test/run-malloc.c
 delete mode 100644 lib/ccan/failtest/test/run-open.c
 delete mode 100644 lib/ccan/failtest/test/run-with-fdlimit.c
 delete mode 100644 lib/ccan/failtest/test/run-write.c
 delete mode 100644 lib/ccan/hash/_info
 delete mode 100644 lib/ccan/hash/hash.c
 delete mode 100644 lib/ccan/hash/hash.h
 delete mode 100644 lib/ccan/hash/test/api-hash_stable.c
 delete mode 100644 lib/ccan/hash/test/run.c
 delete mode 100644 lib/ccan/htable/LICENSE
 delete mode 100644 lib/ccan/htable/_info
 delete mode 100644 lib/ccan/htable/htable.c
 delete mode 100644 lib/ccan/htable/htable.h
 delete mode 100644 lib/ccan/htable/htable_type.h
 delete mode 100644 lib/ccan/htable/test/run-size.c
 delete mode 100644 lib/ccan/htable/test/run-type.c
 delete mode 100644 lib/ccan/htable/test/run.c
 delete mode 100644 lib/ccan/htable/tools/Makefile
 delete mode 100644 lib/ccan/htable/tools/hsearchspeed.c
 delete mode 100644 lib/ccan/htable/tools/speed.c
 delete mode 100644 lib/ccan/htable/tools/stringspeed.c
 delete mode 100644 lib/ccan/ilog/LICENSE
 delete mode 100644 lib/ccan/ilog/_info
 delete mode 100644 lib/ccan/ilog/ilog.c
 delete mode 100644 lib/ccan/ilog/ilog.h
 delete mode 100644 lib/ccan/ilog/test/run-out-of-line.c
 delete mode 100644 lib/ccan/ilog/test/run.c
 delete mode 100644 lib/ccan/likely/LICENSE
 delete mode 100644 lib/ccan/likely/_info
 delete mode 100644 lib/ccan/likely/likely.c
 delete mode 100644 lib/ccan/likely/likely.h
 delete mode 100644 lib/ccan/likely/test/run-debug.c
 delete mode 100644 lib/ccan/likely/test/run.c
 delete mode 100644 lib/ccan/list/.namespacize
 delete mode 100644 lib/ccan/list/LICENSE
 delete mode 100644 lib/ccan/list/_info
 delete mode 100644 lib/ccan/list/list.c
 delete mode 100644 lib/ccan/list/list.d
 delete mode 100644 lib/ccan/list/list.h
 delete mode 100644 lib/ccan/list/test/compile_ok-constant.c
 delete mode 100644 lib/ccan/list/test/helper.c
 delete mode 100644 lib/ccan/list/test/helper.h
 delete mode 100644 lib/ccan/list/test/run-check-corrupt.c
 delete mode 100644 lib/ccan/list/test/run-list_del_from-assert.c
 delete mode 100644 lib/ccan/list/test/run-single-eval.c
 delete mode 100644 lib/ccan/list/test/run-with-debug.c
 delete mode 100644 lib/ccan/list/test/run.c
 delete mode 100644 lib/ccan/read_write_all/LICENSE
 delete mode 100644 lib/ccan/read_write_all/_info
 delete mode 100644 lib/ccan/read_write_all/read_write_all.c
 delete mode 100644 lib/ccan/read_write_all/read_write_all.d
 delete mode 100644 lib/ccan/read_write_all/read_write_all.h
 delete mode 100644 lib/ccan/read_write_all/test/run-read_all.c
 delete mode 100644 lib/ccan/read_write_all/test/run-write_all.c
 delete mode 100644 lib/ccan/str/_info
 delete mode 100644 lib/ccan/str/debug.c
 delete mode 100644 lib/ccan/str/str.c
 delete mode 100644 lib/ccan/str/str.h
 delete mode 100644 lib/ccan/str/str_debug.h
 delete mode 100644 lib/ccan/str/test/compile_fail-isalnum.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isalpha.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isascii.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isblank.c
 delete mode 100644 lib/ccan/str/test/compile_fail-iscntrl.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isdigit.c
 delete mode 100644 lib/ccan/str/test/compile_fail-islower.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isprint.c
 delete mode 100644 lib/ccan/str/test/compile_fail-ispunct.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isspace.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isupper.c
 delete mode 100644 lib/ccan/str/test/compile_fail-isxdigit.c
 delete mode 100644 lib/ccan/str/test/compile_fail-strchr.c
 delete mode 100644 lib/ccan/str/test/compile_fail-strrchr.c
 delete mode 100644 lib/ccan/str/test/compile_fail-strstr.c
 delete mode 100644 lib/ccan/str/test/debug.c
 delete mode 100644 lib/ccan/str/test/run.c
 delete mode 100644 lib/ccan/strset/tools/Makefile
 delete mode 100644 lib/ccan/strset/tools/cbspeed.c
 delete mode 100644 lib/ccan/strset/tools/speed.c
 delete mode 100644 lib/ccan/tally/LICENSE
 delete mode 100644 lib/ccan/tally/_info
 delete mode 100644 lib/ccan/tally/tally.c
 delete mode 100644 lib/ccan/tally/tally.h
 delete mode 100644 lib/ccan/tally/test/run-bucket_of.c
 delete mode 100644 lib/ccan/tally/test/run-divlu64.c
 delete mode 100644 lib/ccan/tally/test/run-histogram.c
 delete mode 100644 lib/ccan/tally/test/run-mean.c
 delete mode 100644 lib/ccan/tally/test/run-median.c
 delete mode 100644 lib/ccan/tally/test/run-min-max.c
 delete mode 100644 lib/ccan/tally/test/run-mode.c
 delete mode 100644 lib/ccan/tally/test/run-renormalize.c
 delete mode 100644 lib/ccan/tally/test/run-total.c
 delete mode 100644 lib/ccan/tcon/_info
 delete mode 100644 lib/ccan/tcon/tcon.h
 delete mode 100644 lib/ccan/tcon/test/compile_fail-tcon_cast.c
 delete mode 100644 lib/ccan/tcon/test/compile_fail.c
 delete mode 100644 lib/ccan/tcon/test/compile_ok-void.c
 delete mode 100644 lib/ccan/tcon/test/compile_ok.c
 delete mode 100644 lib/ccan/time/LICENSE
 delete mode 100644 lib/ccan/time/_info
 delete mode 100644 lib/ccan/time/test/run.c
 delete mode 100644 lib/ccan/time/time.c
 delete mode 100644 lib/ccan/time/time.d
 delete mode 100644 lib/ccan/time/time.h
 delete mode 100644 lib/ccan/tlist/LICENSE
 delete mode 100644 lib/ccan/tlist/_info
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_add.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_add_tail.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_del_from.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_for_each.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_for_each_safe.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_tail.c
 delete mode 100644 lib/ccan/tlist/test/compile_fail-tlist_top.c
 delete mode 100644 lib/ccan/tlist/test/run.c
 delete mode 100644 lib/ccan/tlist/tlist.h
 delete mode 100644 lib/ccan/typesafe_cb/LICENSE
 delete mode 100644 lib/ccan/typesafe_cb/_info
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-cast_if_any.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-cast_if_type-promotable.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-cast_if_type.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb-int.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb_cast-multi.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb_cast.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb_exact.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb_postargs.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_fail-typesafe_cb_preargs.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-cast_if_any.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb-NULL.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb-const.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb-undefined.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb-vars.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb-volatile.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb_cast.c
 delete mode 100644 lib/ccan/typesafe_cb/test/compile_ok-typesafe_cb_def-const.c
 delete mode 100644 lib/ccan/typesafe_cb/test/run.c
 delete mode 100644 lib/ccan/typesafe_cb/typesafe_cb.h
 delete mode 100644 lib/ccan/wscript
 delete mode 100644 lib/dbwrap/dbwrap_ntdb.c
 delete mode 100644 lib/dbwrap/dbwrap_ntdb.h
 delete mode 100644 lib/ntdb/ABI/ntdb-0.9.sigs
 delete mode 100644 lib/ntdb/ABI/ntdb-1.0.sigs
 delete mode 100644 lib/ntdb/LICENSE
 delete mode 100644 lib/ntdb/Makefile
 delete mode 100644 lib/ntdb/check.c
 delete mode 100755 lib/ntdb/configure
 delete mode 100644 lib/ntdb/doc/TDB_porting.txt
 delete mode 100644 lib/ntdb/doc/design.lyx
 delete mode 100644 lib/ntdb/doc/design.pdf
 delete mode 100644 lib/ntdb/doc/design.txt
 delete mode 100644 lib/ntdb/free.c
 delete mode 100644 lib/ntdb/hash.c
 delete mode 100644 lib/ntdb/io.c
 delete mode 100644 lib/ntdb/lock.c
 delete mode 100644 lib/ntdb/man/ntdb.3.xml
 delete mode 100644 lib/ntdb/man/ntdbbackup.8.xml
 delete mode 100644 lib/ntdb/man/ntdbdump.8.xml
 delete mode 100644 lib/ntdb/man/ntdbrestore.8.xml
 delete mode 100644 lib/ntdb/man/ntdbtool.8.xml
 delete mode 100644 lib/ntdb/ntdb.c
 delete mode 100644 lib/ntdb/ntdb.h
 delete mode 100644 lib/ntdb/ntdb.pc.in
 delete mode 100644 lib/ntdb/open.c
 delete mode 100644 lib/ntdb/private.h
 delete mode 100644 lib/ntdb/pyntdb.c
 delete mode 100644 lib/ntdb/summary.c
 delete mode 100644 lib/ntdb/test/api-12-store.c
 delete mode 100644 lib/ntdb/test/api-13-delete.c
 delete mode 100644 lib/ntdb/test/api-14-exists.c
 delete mode 100644 lib/ntdb/test/api-16-wipe_all.c
 delete mode 100644 lib/ntdb/test/api-20-alloc-attr.c
 delete mode 100644 lib/ntdb/test/api-21-parse_record.c
 delete mode 100644 lib/ntdb/test/api-55-transaction.c
 delete mode 100644 lib/ntdb/test/api-60-noop-transaction.c
 delete mode 100644 lib/ntdb/test/api-80-tdb_fd.c
 delete mode 100644 lib/ntdb/test/api-81-seqnum.c
 delete mode 100644 lib/ntdb/test/api-82-lockattr.c
 delete mode 100644 lib/ntdb/test/api-83-openhook.c
 delete mode 100644 lib/ntdb/test/api-91-get-stats.c
 delete mode 100644 lib/ntdb/test/api-92-get-set-readonly.c
 delete mode 100644 lib/ntdb/test/api-93-repack.c
 delete mode 100644 lib/ntdb/test/api-94-expand-during-parse.c
 delete mode 100644 lib/ntdb/test/api-95-read-only-during-parse.c
 delete mode 100644 lib/ntdb/test/api-add-remove-flags.c
 delete mode 100644 lib/ntdb/test/api-check-callback.c
 delete mode 100644 lib/ntdb/test/api-firstkey-nextkey.c
 delete mode 100644 lib/ntdb/test/api-fork-test.c
 delete mode 100644 lib/ntdb/test/api-locktimeout.c
 delete mode 100644 lib/ntdb/test/api-missing-entries.c
 delete mode 100644 lib/ntdb/test/api-open-multiple-times.c
 delete mode 100644 lib/ntdb/test/api-record-expand.c
 delete mode 100644 lib/ntdb/test/api-simple-delete.c
 delete mode 100644 lib/ntdb/test/api-summary.c
 delete mode 100644 lib/ntdb/test/external-agent.c
 delete mode 100644 lib/ntdb/test/external-agent.h
 delete mode 100644 lib/ntdb/test/failtest_helper.c
 delete mode 100644 lib/ntdb/test/failtest_helper.h
 delete mode 100644 lib/ntdb/test/helpapi-external-agent.c
 delete mode 100644 lib/ntdb/test/helprun-external-agent.c
 delete mode 100644 lib/ntdb/test/helprun-layout.c
 delete mode 100644 lib/ntdb/test/layout.h
 delete mode 100644 lib/ntdb/test/lock-tracking.c
 delete mode 100644 lib/ntdb/test/lock-tracking.h
 delete mode 100644 lib/ntdb/test/logging.c
 delete mode 100644 lib/ntdb/test/logging.h
 delete mode 100644 lib/ntdb/test/no-fsync.h
 delete mode 100644 lib/ntdb/test/ntdb-source.h
 delete mode 100644 lib/ntdb/test/python-api.py
 delete mode 100644 lib/ntdb/test/run-001-encode.c
 delete mode 100644 lib/ntdb/test/run-001-fls.c
 delete mode 100644 lib/ntdb/test/run-01-new_database.c
 delete mode 100644 lib/ntdb/test/run-02-expand.c
 delete mode 100644 lib/ntdb/test/run-03-coalesce.c
 delete mode 100644 lib/ntdb/test/run-04-basichash.c
 delete mode 100644 lib/ntdb/test/run-05-readonly-open.c
 delete mode 100644 lib/ntdb/test/run-10-simple-store.c
 delete mode 100644 lib/ntdb/test/run-11-simple-fetch.c
 delete mode 100644 lib/ntdb/test/run-12-check.c
 delete mode 100644 lib/ntdb/test/run-15-append.c
 delete mode 100644 lib/ntdb/test/run-25-hashoverload.c
 delete mode 100644 lib/ntdb/test/run-30-exhaust-before-expand.c
 delete mode 100644 lib/ntdb/test/run-35-convert.c
 delete mode 100644 lib/ntdb/test/run-50-multiple-freelists.c
 delete mode 100644 lib/ntdb/test/run-56-open-during-transaction.c
 delete mode 100644 lib/ntdb/test/run-57-die-during-transaction.c
 delete mode 100644 lib/ntdb/test/run-64-bit-tdb.c
 delete mode 100644 lib/ntdb/test/run-90-get-set-attributes.c
 delete mode 100644 lib/ntdb/test/run-capabilities.c
 delete mode 100644 lib/ntdb/test/run-expand-in-transaction.c
 delete mode 100644 lib/ntdb/test/run-features.c
 delete mode 100644 lib/ntdb/test/run-lockall.c
 delete mode 100644 lib/ntdb/test/run-remap-in-read_traverse.c
 delete mode 100644 lib/ntdb/test/run-seed.c
 delete mode 100644 lib/ntdb/test/run-tdb_errorstr.c
 delete mode 100644 lib/ntdb/test/run-tdb_foreach.c
 delete mode 100644 lib/ntdb/test/run-traverse.c
 delete mode 100644 lib/ntdb/test/tap-interface.c
 delete mode 100644 lib/ntdb/test/tap-interface.h
 delete mode 100644 lib/ntdb/tools/Makefile
 delete mode 100644 lib/ntdb/tools/growtdb-bench.c
 delete mode 100644 lib/ntdb/tools/mkntdb.c
 delete mode 100644 lib/ntdb/tools/ntdbbackup.c
 delete mode 100644 lib/ntdb/tools/ntdbdump.c
 delete mode 100644 lib/ntdb/tools/ntdbrestore.c
 delete mode 100644 lib/ntdb/tools/ntdbtool.c
 delete mode 100644 lib/ntdb/tools/ntdbtorture.c
 delete mode 100644 lib/ntdb/tools/speed.c
 delete mode 100644 lib/ntdb/transaction.c
 delete mode 100644 lib/ntdb/traverse.c
 delete mode 100644 lib/ntdb/wscript
 delete mode 100644 lib/tdb_compat/tdb_compat.c
 delete mode 100644 lib/tdb_compat/tdb_compat.h
 delete mode 100644 lib/tdb_compat/wscript
 delete mode 100644 lib/util/util_ntdb.c
 delete mode 100644 lib/util/util_ntdb.h


Changeset truncated at 500 lines:

diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index cd7093c..fa75e22 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -74,7 +74,6 @@ flags = [
 '-Ilib/talloc',
 '-Ilib/tdb',
 '-Ilib/tdb/include',
-'-Ilib/tdb_compat',
 '-Ilib/tevent',
 '-Ilib/tsocket',
 '-Ilib/util/charset',
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index ffe6784..6d06fd9 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -62,7 +62,7 @@ def s3_fix_kwargs(bld, kwargs):
     s3reldir = os_path_relpath(s3dir, bld.curdir)
 
     # the extra_includes list is relative to the source3 directory
-    extra_includes = [ '.', 'include', 'lib', '../lib/tdb_compat' ]
+    extra_includes = [ '.', 'include', 'lib' ]
     # local heimdal paths only included when USING_SYSTEM_KRB5 is not set
     if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
         extra_includes += [ '../source4/heimdal/lib/com_err',
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
index 19fe681..9bda64d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TDBFiles.xml
@@ -32,92 +32,87 @@
 	is at system shutdown (backup) and startup (restore from backup).
 	</para>
 
-<para>
-<indexterm><primary>NTDB</primary></indexterm>
-</para>
-	As of Samba 4.1, the NTDB format can be used if 'use ntdb' is set.  In this case, tdb files are automatically converted to ntdb files (with the .ntdb extension).  The old .tdb file is turned into a dangling symlink to 'This is now in an NTDB' to prevent it being accidentally used).  The table indicates what databases are currently available as NTDB files.
-
 <table frame="all" id="TOSH-TDB">
                 <title>Samba's Trivial Database Files</title>
                 <tgroup align="center" cols="2">
                 <thead>
-                <row><entry>File name</entry><entry>Preserve</entry><entry>NTDB</entry><entry>Description</entry></row>
+                <row><entry>File name</entry><entry>Preserve</entry><entry>Description</entry></row>
                 </thead>
 
                 <tbody>
-                        <row><entry>account_policy.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>account_policy.tdb</entry><entry>Y</entry>
 				<entry><para>NT account policy settings such as pw expiration, etc...</para></entry></row>
-                        <row><entry>brlock.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>brlock.tdb</entry><entry>N</entry>
 				<entry><para>Byte range locks.</para></entry></row>
-                        <row><entry>browse.dat</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>browse.dat</entry><entry>N</entry>
 				<entry><para>Browse lists - gets rebuilt automatically.</para></entry></row>
-                        <row><entry>connections.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>connections.tdb</entry><entry>N</entry>
 				<entry><para>Share connections. Used to enforce max connections, etc.</para></entry></row>
-                        <row><entry>gencache.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>gencache.tdb</entry><entry>N</entry>
 				<entry><para>Generic caching database.</para></entry></row>
-                        <row><entry>group_mapping.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>group_mapping.tdb</entry><entry>Y</entry>
 				<entry><para>Stores group mapping information. Not used when using LDAP backend.</para></entry></row>
-                        <row><entry>  lang_en.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>  lang_en.tdb</entry><entry>Y</entry>
 				<entry><para>Stores language encoding information.</para></entry></row>
-                        <row><entry>locking.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>locking.tdb</entry><entry>N</entry>
 				<entry><para>Stores share mode and oplock information.</para></entry></row>
-                        <row><entry>login_cache.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>login_cache.tdb</entry><entry>N</entry>
 				<entry><para>Keeps a log of bad pw attempts.</para></entry></row>
-                        <row><entry>messages.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>messages.tdb</entry><entry>N</entry>
 				<entry><para>Used to keep track of Samba internal messaging.</para></entry></row>
-                        <row><entry>netsamlogon_cache.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>netsamlogon_cache.tdb</entry><entry>Y</entry>
 				<entry><para>
 					Cache of user net_info_3 struct from <emphasis>net_samlogon()</emphasis>
 					requests from domain member machines.
 				</para></entry></row>
-                        <row><entry>ntdrivers.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>ntdrivers.tdb</entry><entry>Y</entry>
 				<entry><para>Stores installed printer driver information.</para></entry></row>
-                        <row><entry>ntforms.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>ntforms.tdb</entry><entry>Y</entry>
 				<entry><para>Stores installed printer forms information.</para></entry></row>
-                        <row><entry>ntprinters.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>ntprinters.tdb</entry><entry>Y</entry>
 				<entry><para>Stores installed printers information.</para></entry></row>
-                        <row><entry>printing directory</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>printing directory</entry><entry>Y</entry>
 				<entry><para>Directory containing tdb per print queue of cached lpq output.</para></entry></row>
-                        <row><entry>registry.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>registry.tdb</entry><entry>Y</entry>
 				<entry><para>Windows registry skeleton (connect via regedit.exe).</para></entry></row>
-                        <row><entry>sessionid.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>sessionid.tdb</entry><entry>N</entry>
 				<entry><para>Session information to support <literal>utmp = yes</literal> capabilities.</para></entry></row>
-                        <row><entry>share_info.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>share_info.tdb</entry><entry>Y</entry>
 				<entry><para>Stores share-level ACL configuration settings.
 					Default ACL is <emphasis>Everyone - Full Control</emphasis>.
 				</para></entry></row>
-                        <row><entry>unexpected.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>unexpected.tdb</entry><entry>N</entry>
 				<entry><para>
 					Unexpected packet queue needed to support windows clients that respond on a 
 					different port that the originating reques.
 				</para></entry></row>
-                        <row><entry>winbindd_cache.tdb</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>winbindd_cache.tdb</entry><entry>N</entry>
 				<entry><para>Winbind's cache of user lists.</para></entry></row>
-                        <row><entry>winbindd_idmap.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>winbindd_idmap.tdb</entry><entry>Y</entry>
 				<entry><para>Winbind's local IDMAP database.</para></entry></row>
-                        <row><entry>wins.dat</entry><entry>N</entry><entry>N</entry>
+                        <row><entry>wins.dat</entry><entry>N</entry>
 				<entry><para>
 				WINS database iused only when <parameter>wins support = yes</parameter>
 				has been set. This gets rebuilt or updated at every restart.
 				</para></entry></row>
-                        <row><entry>wins.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>wins.tdb</entry><entry>Y</entry>
 				<entry><para>
 				The working permanent storage for all WINS data. This database is used only
 				when <parameter>wins support = yes</parameter> has been set in the &smb.conf; file.
 				Note: This retains all manually configured WINS entries. Manual setting can be done use the net utility.
 				</para></entry></row>
-                        <row><entry>secrets.tdb</entry><entry>Y</entry><entry>Y</entry>
+                        <row><entry>secrets.tdb</entry><entry>Y</entry>
 				<entry><para>
 				This tdb file stores internal settings such as the machine and the domain SID, secret passwords
 				that are used with LDAP, the machine secret token, etc. This is an essential file that is stored
 				in a secure area. Vendors locate this in various folders. Check <command>smbd -b</command> to
 				find its location on your system.
 				</para></entry></row>
-                        <row><entry>schannel_store.tdb</entry><entry>Y</entry><entry>Y</entry>
+                        <row><entry>schannel_store.tdb</entry><entry>Y</entry>
 				<entry><para>
 				This stores secure channel access token information used with SMB signing.
 				</para></entry></row>
-                        <row><entry>passdb.tdb</entry><entry>Y</entry><entry>N</entry>
+                        <row><entry>passdb.tdb</entry><entry>Y</entry>
 				<entry><para>
 				This stores the Samba SAM account information when using a tdbsam password backend.
 				</para></entry></row>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index feb92cc..a2d8932 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -1258,7 +1258,7 @@ against an NT4 Domain Controller.
 <refsect2>
 <title>RPC GETSID</title>
 
-<para>Fetch domain SID and store it in the local <filename>secrets.tdb</filename> (or <filename>secrets.ntdb</filename>). </para>
+<para>Fetch domain SID and store it in the local <filename>secrets.tdb</filename>. </para>
 
 </refsect2>
 
diff --git a/docs-xml/manpages/smbpasswd.8.xml b/docs-xml/manpages/smbpasswd.8.xml
index d7f306c..4a3fbdd 100644
--- a/docs-xml/manpages/smbpasswd.8.xml
+++ b/docs-xml/manpages/smbpasswd.8.xml
@@ -326,7 +326,7 @@
 		has been compiled with LDAP support. The <parameter>-w</parameter> 
 		switch is used to specify the password to be used with the 
 		<smbconfoption name="ldap admin dn"/>.  Note that the password is stored in
-		the <filename>secrets.tdb</filename> (or <filename>secrets.ntdb</filename>) and is keyed off
+		the <filename>secrets.tdb</filename> and is keyed off
 		of the admin's DN.  This means that if the value of <parameter>ldap
 		admin dn</parameter> ever changes, the password will need to be 
 		manually updated as well.
@@ -343,7 +343,7 @@
 		has been compiled with LDAP support. The <parameter>-W</parameter>
 		switch is used to specify the password to be used with the
 		<smbconfoption name="ldap admin dn"/>.  Note that the password is stored in
-		the <filename>secrets.tdb</filename> (or <filename>secrets.ntdb</filename>) and is keyed off
+		the <filename>secrets.tdb</filename> and is keyed off
 		of the admin's DN.  This means that if the value of <parameter>ldap
 		admin dn</parameter> ever changes, the password will need to be
 		manually updated as well.
diff --git a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
index 27a06da..3bc1709 100644
--- a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
@@ -129,7 +129,7 @@
 	<itemizedlist>
 		<listitem>
 		<para>
-		The data from the module may be send encrypted, with a key stored in secrets.tdb (or secrets.ntdb). The
+		The data from the module may be send encrypted, with a key stored in secrets.tdb. The
 		Receiver then has to use the same key. The module does AES block encryption over the
 		data to send.
 		</para>
diff --git a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
index 4f55e81..a8e312b 100644
--- a/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
+++ b/docs-xml/smbdotconf/domain/machinepasswordtimeout.xml
@@ -9,7 +9,7 @@
 	If a Samba server is a member of a Windows NT Domain (see the <smbconfoption
 	name="security">domain</smbconfoption> parameter) then periodically a running smbd process will try and change
 	the MACHINE ACCOUNT PASSWORD stored in the TDB called <filename moreinfo="none">private/secrets.tdb
-	</filename> (or <filename moreinfo="none">private/secrets.ntdb</filename>).  This parameter specifies how often this password will be changed, in seconds. The default is one
+	</filename>.  This parameter specifies how often this password will be changed, in seconds. The default is one
 	week (expressed in seconds), the same as a Windows NT Domain member server.
 	</para>
 
diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
index b5fe0fb..442d242 100644
--- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
@@ -8,7 +8,7 @@
 	 <para>
 	The <smbconfoption name="ldap admin dn"/> defines the Distinguished  Name (DN) name used by Samba to contact
 	the ldap server when retreiving  user account information. The <smbconfoption name="ldap admin dn"/> is used
-	in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename> (or <filename moreinfo="none">private/secrets.ntdb</filename>)
+	in conjunction with the admin dn password stored in the <filename moreinfo="none">private/secrets.tdb</filename>
 	file.  See the <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>
 	man page for more information on how  to accomplish this.
 	</para>
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
index c954194..9cd3530 100644
--- a/docs-xml/smbdotconf/security/kerberosmethod.xml
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -8,7 +8,7 @@
 
 	<para>Valid options are:</para>
 	<itemizedlist>
-	  <listitem><para>secrets only - use only the secrets.(n)tdb for
+	  <listitem><para>secrets only - use only the secrets.tdb for
 	  ticket verification (default)</para></listitem>
 
 	  <listitem><para>system keytab - use only the system keytab
@@ -17,7 +17,7 @@
 	  <listitem><para>dedicated keytab - use a dedicated keytab
 	  for ticket verification</para></listitem>
 
-	  <listitem><para>secrets and keytab - use the secrets.(n)tdb
+	  <listitem><para>secrets and keytab - use the secrets.tdb
 	  first, then the system keytab</para></listitem>
 	</itemizedlist>
 
diff --git a/docs-xml/smbdotconf/security/privatedir.xml b/docs-xml/smbdotconf/security/privatedir.xml
index ff3fa57..9142bde 100644
--- a/docs-xml/smbdotconf/security/privatedir.xml
+++ b/docs-xml/smbdotconf/security/privatedir.xml
@@ -8,7 +8,7 @@
 <description>
     <para>This parameters defines the directory
     smbd will use for storing such files as <filename moreinfo="none">smbpasswd</filename>
-    and <filename moreinfo="none">secrets.tdb</filename> (or <filename moreinfo="none">secrets.ntdb</filename>).
+    and <filename moreinfo="none">secrets.tdb</filename>.
 </para>
 </description>
 
diff --git a/docs-xml/smbdotconf/tuning/usentdb.xml b/docs-xml/smbdotconf/tuning/usentdb.xml
deleted file mode 100644
index 18f46a6..0000000
--- a/docs-xml/smbdotconf/tuning/usentdb.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<samba:parameter name="use ntdb"
-                 context="G"
-				 type="boolean"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-    <para>Beginning in Samba 4.1, a growing number of databases can
-    use the NTDB format rather than TDB.
-    </para>
-    <para>If you enable this option these databases will default to a
-    <filename>.ntdb</filename> extension rather than
-    <filename>.tdb</filename>. If the <filename>.tdb</filename> file
-    exists, it will automatically be converted to NTDB and renamed to
-    <filename>.tdb.bak</filename>.
-    </para>
-    <para>Filenames explicitly specified in
-    <filename>smb.conf</filename> will be respected (i.e. the format
-    will depend on the <filename>.ntdb</filename> or
-    <filename>.tdb</filename> extension).
-    </para>
-</description>
-
-<value type="default">no</value>
-</samba:parameter>
diff --git a/lib/ccan/README b/lib/ccan/README
deleted file mode 100644
index 5ba0a32..0000000
--- a/lib/ccan/README
+++ /dev/null
@@ -1,9 +0,0 @@
-These files are from the CCAN project (http://ccan.ozlabs.org); the
-_info and LICENSE files in each directory indicate their (separate)
-licenses.
-
-I'm trying to keep them in sync with the upstream versions as much as
-possible, so please be careful!
-
-Thanks!
-Rusty Russell <rusty at rustcorp.com.au>
diff --git a/lib/ccan/array_size/_info b/lib/ccan/array_size/_info
deleted file mode 100644
index 0ecb45d..0000000
--- a/lib/ccan/array_size/_info
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "config.h"
-
-/**
- * array_size - routine for safely deriving the size of a visible array.
- *
- * This provides a simple ARRAY_SIZE() macro, which (given a good compiler)
- * will also break compile if you try to use it on a pointer.
- *
- * This can ensure your code is robust to changes, without needing a gratuitous
- * macro or constant.
- *
- * Example:
- *	// Outputs "Initialized 32 values"
- *	#include <ccan/array_size/array_size.h>
- *	#include <stdlib.h>
- *	#include <stdio.h>
- *
- *	// We currently use 32 random values.
- *	static unsigned int vals[32];
- *
- *	int main(void)
- *	{
- *		unsigned int i;
- *		for (i = 0; i < ARRAY_SIZE(vals); i++)
- *			vals[i] = random();
- *		printf("Initialized %u values\n", i);
- *		return 0;
- *	}
- *
- * License: Public domain
- * Author: Rusty Russell <rusty at rustcorp.com.au>
- */
-int main(int argc, char *argv[])
-{
-	if (argc != 2)
-		return 1;
-
-	if (strcmp(argv[1], "depends") == 0) {
-		printf("ccan/build_assert\n");
-		return 0;
-	}
-
-	return 1;
-}
diff --git a/lib/ccan/array_size/array_size.h b/lib/ccan/array_size/array_size.h
deleted file mode 100644
index 0876945..0000000
--- a/lib/ccan/array_size/array_size.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef CCAN_ARRAY_SIZE_H
-#define CCAN_ARRAY_SIZE_H
-#include "config.h"
-#include <ccan/build_assert/build_assert.h>
-
-/**
- * ARRAY_SIZE - get the number of elements in a visible array
- * @arr: the array whose size you want.
- *
- * This does not work on pointers, or arrays declared as [], or
- * function parameters.  With correct compiler support, such usage
- * will cause a build error (see build_assert).
- */
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr))
-
-#if HAVE_BUILTIN_TYPES_COMPATIBLE_P && HAVE_TYPEOF
-/* Two gcc extensions.
- * &a[0] degrades to a pointer: a different type from an array */
-#define _array_size_chk(arr)						\
-	BUILD_ASSERT_OR_ZERO(!__builtin_types_compatible_p(typeof(arr),	\
-							typeof(&(arr)[0])))
-#else
-#define _array_size_chk(arr) 0
-#endif
-#endif /* CCAN_ALIGNOF_H */
diff --git a/lib/ccan/array_size/test/compile_fail-function-param.c b/lib/ccan/array_size/test/compile_fail-function-param.c
deleted file mode 100644
index cb64d98..0000000
--- a/lib/ccan/array_size/test/compile_fail-function-param.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <ccan/array_size/array_size.h>
-#include <stdlib.h>
-
-struct foo {
-	unsigned int a, b;
-};
-
-int check_parameter(const struct foo array[4]);
-int check_parameter(const struct foo array[4])
-{
-#ifdef FAIL
-	return (ARRAY_SIZE(array) == 4);
-#if !HAVE_TYPEOF || !HAVE_BUILTIN_TYPES_COMPATIBLE_P
-#error "Unfortunately we don't fail if _array_size_chk is a noop."
-#endif
-#else
-	return sizeof(array) == 4 * sizeof(struct foo);
-#endif
-}
-
-int main(int argc, char *argv[])
-{
-	return check_parameter(NULL);
-}
diff --git a/lib/ccan/array_size/test/compile_fail.c b/lib/ccan/array_size/test/compile_fail.c
deleted file mode 100644
index 37d315f..0000000
--- a/lib/ccan/array_size/test/compile_fail.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <ccan/array_size/array_size.h>
-
-int main(int argc, char *argv[8])
-{
-	char array[100];
-#ifdef FAIL
-	return ARRAY_SIZE(argv) + ARRAY_SIZE(array);
-#if !HAVE_TYPEOF || !HAVE_BUILTIN_TYPES_COMPATIBLE_P
-#error "Unfortunately we don't fail if _array_size_chk is a noop."
-#endif
-#else
-	return ARRAY_SIZE(array);
-#endif
-}
diff --git a/lib/ccan/array_size/test/run.c b/lib/ccan/array_size/test/run.c
deleted file mode 100644
index 37b4200..0000000
--- a/lib/ccan/array_size/test/run.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <ccan/array_size/array_size.h>
-#include <ccan/tap/tap.h>
-
-static char array1[1];
-static int array2[2];
-static unsigned long array3[3][5];
-struct foo {
-	unsigned int a, b;
-	char string[100];
-};
-static struct foo array4[4];
-
-/* Make sure they can be used in initializers. */
-static int array1_size = ARRAY_SIZE(array1);
-static int array2_size = ARRAY_SIZE(array2);
-static int array3_size = ARRAY_SIZE(array3);
-static int array4_size = ARRAY_SIZE(array4);
-
-int main(int argc, char *argv[])
-{
-	plan_tests(8);
-	ok1(array1_size == 1);
-	ok1(array2_size == 2);
-	ok1(array3_size == 3);
-	ok1(array4_size == 4);
-
-	ok1(ARRAY_SIZE(array1) == 1);
-	ok1(ARRAY_SIZE(array2) == 2);
-	ok1(ARRAY_SIZE(array3) == 3);
-	ok1(ARRAY_SIZE(array4) == 4);
-
-	return exit_status();
-}
diff --git a/lib/ccan/asearch/LICENSE b/lib/ccan/asearch/LICENSE
deleted file mode 100644
index 5522aa5..0000000
--- a/lib/ccan/asearch/LICENSE
+++ /dev/null
@@ -1,508 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-


-- 
Samba Shared Repository


More information about the samba-cvs mailing list