summaryrefslogtreecommitdiff
path: root/source4/lib/samba3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-10-20 23:32:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:21:30 -0500
commitaf870da6194b47c6cd09445c1e03832d00e951bb (patch)
treed8693e9c9fc8055d98d4275b7669e2186c86aafa /source4/lib/samba3
parentb316b78cd5d2c511f59ef325c5e8fec68e02ddfe (diff)
downloadsamba-af870da6194b47c6cd09445c1e03832d00e951bb.tar.gz
samba-af870da6194b47c6cd09445c1e03832d00e951bb.tar.bz2
samba-af870da6194b47c6cd09445c1e03832d00e951bb.zip
r19428: moved tdbutil.c from lib/tdb/common/ to lib/util/util_tdb.c
tdbutil.c is Samba specific, so should not be part of the generic tdb library (This used to be commit 979dd24f5e44605fc1603b690913b8c31be7478f)
Diffstat (limited to 'source4/lib/samba3')
-rw-r--r--source4/lib/samba3/group.c3
-rw-r--r--source4/lib/samba3/idmap.c3
-rw-r--r--source4/lib/samba3/policy.c3
-rw-r--r--source4/lib/samba3/registry.c3
-rw-r--r--source4/lib/samba3/secrets.c2
-rw-r--r--source4/lib/samba3/share_info.c3
-rw-r--r--source4/lib/samba3/tdbsam.c3
7 files changed, 13 insertions, 7 deletions
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index fcf015de68..44d8775e42 100644
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -21,7 +21,8 @@
#include "includes.h"
#include "lib/samba3/samba3.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "system/filesys.h"
#include "libcli/security/security.h"
diff --git a/source4/lib/samba3/idmap.c b/source4/lib/samba3/idmap.c
index 334accc2aa..c5c771cdd3 100644
--- a/source4/lib/samba3/idmap.c
+++ b/source4/lib/samba3/idmap.c
@@ -24,7 +24,8 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "lib/samba3/samba3.h"
#include "system/filesys.h"
#include "libcli/security/security.h"
diff --git a/source4/lib/samba3/policy.c b/source4/lib/samba3/policy.c
index cfe6284fc4..936a16bca8 100644
--- a/source4/lib/samba3/policy.c
+++ b/source4/lib/samba3/policy.c
@@ -19,7 +19,8 @@
*/
#include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "lib/samba3/samba3.h"
#include "system/filesys.h"
diff --git a/source4/lib/samba3/registry.c b/source4/lib/samba3/registry.c
index 7f68c9df74..05855b6583 100644
--- a/source4/lib/samba3/registry.c
+++ b/source4/lib/samba3/registry.c
@@ -24,7 +24,8 @@
#include "includes.h"
#include "lib/samba3/samba3.h"
#include "librpc/gen_ndr/winreg.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "system/filesys.h"
#include "pstring.h"
diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 479fedbc28..f838b06154 100644
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -26,10 +26,10 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "lib/samba3/samba3.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/security.h"
-#include "lib/tdb/include/tdbutil.h"
#include "auth/credentials/credentials.h"
/**
diff --git a/source4/lib/samba3/share_info.c b/source4/lib/samba3/share_info.c
index 318e0ff01f..464dcc38e3 100644
--- a/source4/lib/samba3/share_info.c
+++ b/source4/lib/samba3/share_info.c
@@ -23,7 +23,8 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_security.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "lib/samba3/samba3.h"
#include "system/filesys.h"
diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c
index 148a3c90f5..0d4854a270 100644
--- a/source4/lib/samba3/tdbsam.c
+++ b/source4/lib/samba3/tdbsam.c
@@ -22,7 +22,8 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
#include "lib/samba3/samba3.h"
#define TDB_FORMAT_STRING_V0 "ddddddBBBBBBBBBBBBddBBwdwdBwwd"