utils: Move conn_tdb.c to utils/

That's a wrapper that only smbstatus and net status use by now.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Apr 12 00:37:05 UTC 2019 on sn-devel-144

diff --git a/source3/lib/conn_tdb.c b/source3/utils/conn_tdb.c
similarity index 99%
rename from source3/lib/conn_tdb.c
rename to source3/utils/conn_tdb.c
index 36d5faec829a136eac1e9840b641014cb10dc32a..2d8d2d9e042d4ac4e4b62b9ff8a9121f8b1826e9 100644 (file)
--- a/source3/lib/conn_tdb.c
+++ b/source3/utils/conn_tdb.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Low-level connections.tdb access functions
    Copyright (C) Volker Lendecke 2007
@@ -24,7 +24,7 @@
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_rbt.h"
 #include "messages.h"
-#include "lib/conn_tdb.h"
+#include "conn_tdb.h"
 #include "util_tdb.h"
 
 struct connections_forall_state {
@@ -171,4 +171,3 @@ done:
        talloc_free(frame);
        return ret;
 }
-

diff --git a/source3/lib/conn_tdb.h b/source3/utils/conn_tdb.h
similarity index 100%
rename from source3/lib/conn_tdb.h
rename to source3/utils/conn_tdb.h

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 0d658a0c36e0eb632a925fb4b1f2a204a802e461..939c3635d546d7bc60557849e96b85c91f41a5e8 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -21,7 +21,7 @@
 #include "utils/net.h"
 #include "session.h"
 #include "messages.h"
-#include "lib/conn_tdb.h"
+#include "conn_tdb.h"
 
 int net_status_usage(struct net_context *c, int argc, const char **argv)
 {

diff --git a/source3/utils/status.c b/source3/utils/status.c
index d18033778dc7ad5d2815e563db8ba1ac1809cc17..71717857d13cedc1874b4f11081767fb62631c35 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -44,7 +44,7 @@
 #include "librpc/gen_ndr/open_files.h"
 #include "smbd/smbd.h"
 #include "librpc/gen_ndr/notify.h"
-#include "lib/conn_tdb.h"
+#include "conn_tdb.h"
 #include "serverid.h"
 #include "status_profile.h"
 #include "smbd/notifyd/notifyd.h"

diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index 414d3f91f2e149ad4c3f29fd8df4477a614013b7..9d9aa56bf3799960a78628fb079646bcfb952c2d 100644 (file)
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -4,6 +4,9 @@ bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
                     source='passwd_util.c',
                     deps='samba-util')
 
+bld.SAMBA3_SUBSYSTEM('CONN_TDB',
+                     source='conn_tdb.c')
+
 bld.SAMBA3_BINARY('profiles',
                  source='profiles.c',
                  deps='''
@@ -263,6 +266,7 @@ bld.SAMBA3_BINARY('net',
                  printing_migrate
                  trusts_util
                  IDMAP_AUTORID_TDB
+                 CONN_TDB
                  jansson
                  common_auth
                  ''')
@@ -301,4 +305,5 @@ bld.SAMBA3_BINARY('smbstatus',
                       smbd_base
                       LOCKING
                       PROFILE
+                      CONN_TDB
                       ''')

diff --git a/source3/wscript_build b/source3/wscript_build
index 75b1422ca08bd267c82ba777930162c1be980795..5f9c2593949c512cff02d3de42e0b47e7ca56d30 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -671,7 +671,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
                           smbd/error.c
                           printing/printspoolss.c
                           lib/sessionid_tdb.c
-                          lib/conn_tdb.c
                           lib/cleanupdb.c
                           smbd/fake_file.c
                           smbd/quotas.c