[SCM] Samba Shared Repository - branch master updated

Christian Ambach ambi at samba.org
Sat Dec 7 10:39:03 MST 2013


The branch, master has been updated
       via  5390ff5 lib/ntdb optimize includes in ntdb tools
       via  0f41792 lib/ntdb optimize includes in ntdb tests
       via  7be0e91 lib/ntdb correct includes in private header
       via  794db9e lib/ntdb fix compilation when libreplace is not around
       via  100f324 lib/socket_wrapper fix compilation when libreplace is not around
       via  5e2f59d s3:vfs_btrfs change includes
       via  ade52f6 s3:pam_smbpass change includes
      from  2eda479 s3:vfs fix a compile warning

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


- Log -----------------------------------------------------------------
commit 5390ff5a26f7868336d8136b0361943080dd7f5b
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:19:16 2013 +0100

    lib/ntdb optimize includes in ntdb tools
    
    use the private header (which will use libreplace or system headers)
    instead of direct includes of system includes
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Rusty Russell <rusty at samba.org>
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Sat Dec  7 18:38:21 CET 2013 on sn-devel-104

commit 0f41792dc597854f0d53c25c2975f542dd812711
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:18:36 2013 +0100

    lib/ntdb optimize includes in ntdb tests
    
    use the private header (which will use libreplace or system headers)
    instead of direct includes of system includes
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Rusty Russell <rusty at samba.org>

commit 7be0e91ddecf019bf1d7247abc16397a0f80c911
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:17:38 2013 +0100

    lib/ntdb correct includes in private header
    
    include all necessary headers when libreplace is not around
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Rusty Russell <rusty at samba.org>

commit 794db9ea31eabc23a85aeb34fd1d2f227c6682a8
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:15:59 2013 +0100

    lib/ntdb fix compilation when libreplace is not around
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Rusty Russell <rusty at samba.org>

commit 100f324fcd0db19e3db9a9776377a0391e82f775
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:15:13 2013 +0100

    lib/socket_wrapper fix compilation when libreplace is not around
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

commit 5e2f59dce350822495ac59dbf852cdf06ff8e897
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:13:17 2013 +0100

    s3:vfs_btrfs change includes
    
    use the ones from libreplace instead of system ones
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

commit ade52f60343dca96678d24ad12dacab5da000fec
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 22 05:13:56 2013 +0100

    s3:pam_smbpass change includes
    
    use the ones from libreplace instead of system ones
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

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

Summary of changes:
 lib/ntdb/ntdb.c                               |    1 -
 lib/ntdb/ntdb.h                               |   10 ++++++++++
 lib/ntdb/private.h                            |    5 +++++
 lib/ntdb/test/api-12-store.c                  |    4 +---
 lib/ntdb/test/api-13-delete.c                 |    3 ---
 lib/ntdb/test/api-14-exists.c                 |    4 +---
 lib/ntdb/test/api-16-wipe_all.c               |    4 +---
 lib/ntdb/test/api-20-alloc-attr.c             |    4 +---
 lib/ntdb/test/api-21-parse_record.c           |    4 +---
 lib/ntdb/test/api-55-transaction.c            |    3 ---
 lib/ntdb/test/api-60-noop-transaction.c       |    3 ---
 lib/ntdb/test/api-80-tdb_fd.c                 |    4 +---
 lib/ntdb/test/api-81-seqnum.c                 |    4 +---
 lib/ntdb/test/api-82-lockattr.c               |    3 ---
 lib/ntdb/test/api-83-openhook.c               |    8 +-------
 lib/ntdb/test/api-91-get-stats.c              |    6 +-----
 lib/ntdb/test/api-92-get-set-readonly.c       |    4 +---
 lib/ntdb/test/api-93-repack.c                 |    4 +---
 lib/ntdb/test/api-94-expand-during-parse.c    |    3 ---
 lib/ntdb/test/api-95-read-only-during-parse.c |    4 +---
 lib/ntdb/test/api-add-remove-flags.c          |    3 ---
 lib/ntdb/test/api-check-callback.c            |    4 +---
 lib/ntdb/test/api-firstkey-nextkey.c          |    5 +----
 lib/ntdb/test/api-fork-test.c                 |    8 +-------
 lib/ntdb/test/api-locktimeout.c               |    7 +------
 lib/ntdb/test/api-missing-entries.c           |    4 +---
 lib/ntdb/test/api-open-multiple-times.c       |    3 ---
 lib/ntdb/test/api-record-expand.c             |    5 +----
 lib/ntdb/test/api-simple-delete.c             |    4 +---
 lib/ntdb/test/api-summary.c                   |    5 +----
 lib/ntdb/tools/growtdb-bench.c                |    3 ---
 lib/ntdb/tools/ntdbbackup.c                   |    2 +-
 lib/ntdb/tools/ntdbdump.c                     |   14 +-------------
 lib/ntdb/tools/ntdbrestore.c                  |   11 +----------
 lib/ntdb/tools/ntdbtool.c                     |   18 +-----------------
 lib/ntdb/tools/ntdbtorture.c                  |   16 +---------------
 lib/ntdb/tools/speed.c                        |    2 --
 lib/socket_wrapper/socket_wrapper.c           |   20 ++++++++++++++++++++
 source3/modules/vfs_btrfs.c                   |    3 +--
 source3/pam_smbpass/general.h                 |   11 ++++-------
 40 files changed, 65 insertions(+), 168 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ntdb/ntdb.c b/lib/ntdb/ntdb.c
index 5d56b33..51fbbca 100644
--- a/lib/ntdb/ntdb.c
+++ b/lib/ntdb/ntdb.c
@@ -17,7 +17,6 @@
 */
 #include "private.h"
 #ifndef HAVE_LIBREPLACE
-#include <ccan/asprintf/asprintf.h>
 #include <stdarg.h>
 #endif
 
diff --git a/lib/ntdb/ntdb.h b/lib/ntdb/ntdb.h
index df3a9dd..a3a627f 100644
--- a/lib/ntdb/ntdb.h
+++ b/lib/ntdb/ntdb.h
@@ -31,10 +31,20 @@ extern "C" {
 
 #ifdef HAVE_LIBREPLACE
 #include <replace.h>
+#include <system/filesys.h>
 #else
 #if HAVE_FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
+
+#ifndef _PUBLIC_
+#ifdef HAVE_VISIBILITY_ATTR
+#define _PUBLIC_ __attribute__((visibility("default")))
+#else
+#define _PUBLIC_
+#endif
+#endif
+
 /* For mode_t */
 #include <sys/types.h>
 /* For O_* flags. */
diff --git a/lib/ntdb/private.h b/lib/ntdb/private.h
index 5efd2e0..2492537 100644
--- a/lib/ntdb/private.h
+++ b/lib/ntdb/private.h
@@ -35,6 +35,7 @@
 #include "system/select.h"
 #include "system/wait.h"
 #else
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -47,6 +48,10 @@
 #include <stdio.h>
 #include <utime.h>
 #include <unistd.h>
+#include <ctype.h>
+#include <string.h>
+#include <sys/wait.h>
+#include <time.h>
 #endif
 #include <assert.h>
 
diff --git a/lib/ntdb/test/api-12-store.c b/lib/ntdb/test/api-12-store.c
index 45274e0..532a8ee 100644
--- a/lib/ntdb/test/api-12-store.c
+++ b/lib/ntdb/test/api-12-store.c
@@ -1,10 +1,8 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
 #include <ccan/hash/hash.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-13-delete.c b/lib/ntdb/test/api-13-delete.c
index cded8fd..730ade5 100644
--- a/lib/ntdb/test/api-13-delete.c
+++ b/lib/ntdb/test/api-13-delete.c
@@ -1,8 +1,5 @@
 #include "private.h" // For NTDB_TOPLEVEL_HASH_BITS
 #include <ccan/hash/hash.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "ntdb.h"
 #include "tap-interface.h"
 #include "logging.h"
diff --git a/lib/ntdb/test/api-14-exists.c b/lib/ntdb/test/api-14-exists.c
index abaaae0..c40d901 100644
--- a/lib/ntdb/test/api-14-exists.c
+++ b/lib/ntdb/test/api-14-exists.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 static bool test_records(struct ntdb_context *ntdb)
diff --git a/lib/ntdb/test/api-16-wipe_all.c b/lib/ntdb/test/api-16-wipe_all.c
index 6a60752..4eea151 100644
--- a/lib/ntdb/test/api-16-wipe_all.c
+++ b/lib/ntdb/test/api-16-wipe_all.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 static bool add_records(struct ntdb_context *ntdb)
diff --git a/lib/ntdb/test/api-20-alloc-attr.c b/lib/ntdb/test/api-20-alloc-attr.c
index e4ec89a..3df5003 100644
--- a/lib/ntdb/test/api-20-alloc-attr.c
+++ b/lib/ntdb/test/api-20-alloc-attr.c
@@ -1,10 +1,8 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
 #include <ccan/hash/hash.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <assert.h>
 
 #include "logging.h"
diff --git a/lib/ntdb/test/api-21-parse_record.c b/lib/ntdb/test/api-21-parse_record.c
index 975bbfa..5af9abe 100644
--- a/lib/ntdb/test/api-21-parse_record.c
+++ b/lib/ntdb/test/api-21-parse_record.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 static enum NTDB_ERROR parse(NTDB_DATA key, NTDB_DATA data, NTDB_DATA *expected)
diff --git a/lib/ntdb/test/api-55-transaction.c b/lib/ntdb/test/api-55-transaction.c
index 01a1dce..3d3e539 100644
--- a/lib/ntdb/test/api-55-transaction.c
+++ b/lib/ntdb/test/api-55-transaction.c
@@ -1,9 +1,6 @@
 #include "private.h" // struct ntdb_context
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-60-noop-transaction.c b/lib/ntdb/test/api-60-noop-transaction.c
index a429e67..5e56dbc 100644
--- a/lib/ntdb/test/api-60-noop-transaction.c
+++ b/lib/ntdb/test/api-60-noop-transaction.c
@@ -1,9 +1,6 @@
 #include "private.h" // struct ntdb_context
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-80-tdb_fd.c b/lib/ntdb/test/api-80-tdb_fd.c
index 81b7284..ca520a9 100644
--- a/lib/ntdb/test/api-80-tdb_fd.c
+++ b/lib/ntdb/test/api-80-tdb_fd.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/test/api-81-seqnum.c b/lib/ntdb/test/api-81-seqnum.c
index 04f49cd..45963ff 100644
--- a/lib/ntdb/test/api-81-seqnum.c
+++ b/lib/ntdb/test/api-81-seqnum.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-82-lockattr.c b/lib/ntdb/test/api-82-lockattr.c
index 4fbe1d2..f71600c 100644
--- a/lib/ntdb/test/api-82-lockattr.c
+++ b/lib/ntdb/test/api-82-lockattr.c
@@ -1,9 +1,6 @@
 #include "private.h" // for ntdb_fcntl_unlock
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <errno.h>
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-83-openhook.c b/lib/ntdb/test/api-83-openhook.c
index 3816eef..d2930ac 100644
--- a/lib/ntdb/test/api-83-openhook.c
+++ b/lib/ntdb/test/api-83-openhook.c
@@ -1,13 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <unistd.h>
 #include "external-agent.h"
 #include "logging.h"
 
diff --git a/lib/ntdb/test/api-91-get-stats.c b/lib/ntdb/test/api-91-get-stats.c
index 1ed36f0..1041cba 100644
--- a/lib/ntdb/test/api-91-get-stats.c
+++ b/lib/ntdb/test/api-91-get-stats.c
@@ -1,11 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/test/api-92-get-set-readonly.c b/lib/ntdb/test/api-92-get-set-readonly.c
index 81eadff..c557f34 100644
--- a/lib/ntdb/test/api-92-get-set-readonly.c
+++ b/lib/ntdb/test/api-92-get-set-readonly.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/test/api-93-repack.c b/lib/ntdb/test/api-93-repack.c
index 4a30c57..0fade08 100644
--- a/lib/ntdb/test/api-93-repack.c
+++ b/lib/ntdb/test/api-93-repack.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_TESTS 1000
diff --git a/lib/ntdb/test/api-94-expand-during-parse.c b/lib/ntdb/test/api-94-expand-during-parse.c
index 4963e47..3aca88b 100644
--- a/lib/ntdb/test/api-94-expand-during-parse.c
+++ b/lib/ntdb/test/api-94-expand-during-parse.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 #include "../private.h" /* To establish size, esp. for NTDB_INTERNAL dbs */
 
diff --git a/lib/ntdb/test/api-95-read-only-during-parse.c b/lib/ntdb/test/api-95-read-only-during-parse.c
index 8252b81..53adbc3 100644
--- a/lib/ntdb/test/api-95-read-only-during-parse.c
+++ b/lib/ntdb/test/api-95-read-only-during-parse.c
@@ -1,10 +1,8 @@
 /* Make sure write operations fail during ntdb_parse(). */
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 static struct ntdb_context *ntdb;
diff --git a/lib/ntdb/test/api-add-remove-flags.c b/lib/ntdb/test/api-add-remove-flags.c
index c5a3f42..c16ceeb 100644
--- a/lib/ntdb/test/api-add-remove-flags.c
+++ b/lib/ntdb/test/api-add-remove-flags.c
@@ -1,9 +1,6 @@
 #include "private.h" // for ntdb_context
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/test/api-check-callback.c b/lib/ntdb/test/api-check-callback.c
index b5ca8a0..20c88e7 100644
--- a/lib/ntdb/test/api-check-callback.c
+++ b/lib/ntdb/test/api-check-callback.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1000
diff --git a/lib/ntdb/test/api-firstkey-nextkey.c b/lib/ntdb/test/api-firstkey-nextkey.c
index 5e83e6b..179cf76 100644
--- a/lib/ntdb/test/api-firstkey-nextkey.c
+++ b/lib/ntdb/test/api-firstkey-nextkey.c
@@ -1,10 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1000
diff --git a/lib/ntdb/test/api-fork-test.c b/lib/ntdb/test/api-fork-test.c
index 6298a4a..4b114d6 100644
--- a/lib/ntdb/test/api-fork-test.c
+++ b/lib/ntdb/test/api-fork-test.c
@@ -12,14 +12,8 @@
  */
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include "logging.h"
 
 static bool am_child = false;
diff --git a/lib/ntdb/test/api-locktimeout.c b/lib/ntdb/test/api-locktimeout.c
index 5e24d58..4c0fda2 100644
--- a/lib/ntdb/test/api-locktimeout.c
+++ b/lib/ntdb/test/api-locktimeout.c
@@ -1,13 +1,8 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include "system/wait.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <fcntl.h>
 #include <limits.h>
-#include <errno.h>
 #include "logging.h"
 #include "external-agent.h"
 
diff --git a/lib/ntdb/test/api-missing-entries.c b/lib/ntdb/test/api-missing-entries.c
index d9a1fd9..2a00f1b 100644
--- a/lib/ntdb/test/api-missing-entries.c
+++ b/lib/ntdb/test/api-missing-entries.c
@@ -1,11 +1,9 @@
 /* Another test revealed that we lost an entry.  This reproduces it. */
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include <ccan/hash/hash.h>
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 #define NUM_RECORDS 1189
diff --git a/lib/ntdb/test/api-open-multiple-times.c b/lib/ntdb/test/api-open-multiple-times.c
index 8663b8a..6b97bc9 100644
--- a/lib/ntdb/test/api-open-multiple-times.c
+++ b/lib/ntdb/test/api-open-multiple-times.c
@@ -1,9 +1,6 @@
 #include "config.h"
 #include "ntdb.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include "logging.h"
 #include "../private.h"
diff --git a/lib/ntdb/test/api-record-expand.c b/lib/ntdb/test/api-record-expand.c
index 8786fc7..74fb27f 100644
--- a/lib/ntdb/test/api-record-expand.c
+++ b/lib/ntdb/test/api-record-expand.c
@@ -1,10 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
 #include "logging.h"
 
 #define MAX_SIZE 10000
diff --git a/lib/ntdb/test/api-simple-delete.c b/lib/ntdb/test/api-simple-delete.c
index dedc433..e8baf4c 100644
--- a/lib/ntdb/test/api-simple-delete.c
+++ b/lib/ntdb/test/api-simple-delete.c
@@ -1,9 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/test/api-summary.c b/lib/ntdb/test/api-summary.c
index df5d092..af1b595 100644
--- a/lib/ntdb/test/api-summary.c
+++ b/lib/ntdb/test/api-summary.c
@@ -1,10 +1,7 @@
 #include "config.h"
 #include "ntdb.h"
+#include "private.h"
 #include "tap-interface.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
 #include "logging.h"
 
 int main(int argc, char *argv[])
diff --git a/lib/ntdb/tools/growtdb-bench.c b/lib/ntdb/tools/growtdb-bench.c
index aa5a406..28c1de8 100644
--- a/lib/ntdb/tools/growtdb-bench.c
+++ b/lib/ntdb/tools/growtdb-bench.c
@@ -4,9 +4,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <ccan/err/err.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 
 static void logfn(struct ntdb_context *ntdb,
 		  enum ntdb_log_level level,
diff --git a/lib/ntdb/tools/ntdbbackup.c b/lib/ntdb/tools/ntdbbackup.c
index a76f184..c632f0e 100644
--- a/lib/ntdb/tools/ntdbbackup.c
+++ b/lib/ntdb/tools/ntdbbackup.c
@@ -42,7 +42,7 @@
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list