[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Fri Apr 12 00:38:03 UTC 2019
The branch, master has been updated
via fccd9c8c94e utils: Move conn_tdb.c to utils/
via e8ce1c6483a smbd: Remove some unused includes
via d970e843484 build: Move smbstatus definition to source3/utils/wscript_build
from 2029fe72b23 lib: remove duplicate check
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fccd9c8c94e43f0aa77b9553981b6f96b5edfb07
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 13:03:30 2019 +0200
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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri Apr 12 00:37:05 UTC 2019 on sn-devel-144
commit e8ce1c6483a2ebe59feaf7cc339df0be9a87bbec
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 12:58:05 2019 +0200
smbd: Remove some unused includes
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit d970e84348460c0345a43d736fece36851255ef2
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 11 11:36:56 2019 +0200
build: Move smbstatus definition to source3/utils/wscript_build
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 1 -
source3/smbd/connection.c | 1 -
source3/smbd/server.c | 1 -
source3/smbd/sesssetup.c | 1 -
source3/{lib => utils}/conn_tdb.c | 5 ++---
source3/{lib => utils}/conn_tdb.h | 0
source3/utils/net_serverid.c | 1 -
source3/utils/net_status.c | 2 +-
source3/utils/status.c | 2 +-
source3/utils/wscript_build | 24 ++++++++++++++++++++++++
source3/wscript_build | 20 --------------------
11 files changed, 28 insertions(+), 30 deletions(-)
rename source3/{lib => utils}/conn_tdb.c (99%)
rename source3/{lib => utils}/conn_tdb.h (100%)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 2f318550dec..6246a61672e 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -39,7 +39,6 @@
#include "auth.h"
#include "messages.h"
#include "serverid.h"
-#include "lib/conn_tdb.h"
extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 0b78b9e2dbb..c2dae6c73c4 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -24,7 +24,6 @@
#include "auth.h"
#include "../lib/tsocket/tsocket.h"
#include "messages.h"
-#include "lib/conn_tdb.h"
struct count_stat {
int curr_connections;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3a195cfbbb0..3ef7befef3f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -44,7 +44,6 @@
#include "lib/id_cache.h"
#include "lib/param/param.h"
#include "lib/background.h"
-#include "lib/conn_tdb.h"
#include "../lib/util/pidfile.h"
#include "lib/smbd_shim.h"
#include "scavenger.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index a607abb5010..906378a841c 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -32,7 +32,6 @@
#include "smbprofile.h"
#include "../libcli/security/security.h"
#include "auth/gensec/gensec.h"
-#include "lib/conn_tdb.h"
#include "../libcli/smb/smb_signing.h"
/****************************************************************************
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 36d5faec829..2d8d2d9e042 100644
--- 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_serverid.c b/source3/utils/net_serverid.c
index c826f95cc0d..92892e5a4fa 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -24,7 +24,6 @@
#include "dbwrap/dbwrap_rbt.h"
#include "serverid.h"
#include "session.h"
-#include "lib/conn_tdb.h"
#include "smbd/globals.h"
#include "util_tdb.h"
#include "librpc/gen_ndr/ndr_open_files.h"
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 0d658a0c36e..939c3635d54 100644
--- 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 d18033778dc..71717857d13 100644
--- 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 b254073358c..9d9aa56bf37 100644
--- 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
''')
@@ -283,3 +287,23 @@ bld.SAMBA3_BINARY('destroy_netlogon_creds_cli',
NETLOGON_CREDS_CLI
''',
install=False)
+
+smbstatus_source = 'status.c ../smbd/notify_msg.c'
+
+if bld.CONFIG_GET("WITH_PROFILE"):
+ smbstatus_source += ' status_profile.c'
+else:
+ smbstatus_source += ' status_profile_dummy.c'
+
+bld.SAMBA3_BINARY('smbstatus',
+ source=smbstatus_source,
+ deps='''
+ talloc
+ smbconf
+ popt_samba3
+ cmdline_contexts
+ smbd_base
+ LOCKING
+ PROFILE
+ CONN_TDB
+ ''')
diff --git a/source3/wscript_build b/source3/wscript_build
index a8c0fac513a..5f9c2593949 100644
--- 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
@@ -1144,25 +1143,6 @@ bld.SAMBA3_BINARY('locktest2',
''',
install=False)
-smbstatus_source = 'utils/status.c smbd/notify_msg.c'
-
-if bld.CONFIG_GET("WITH_PROFILE"):
- smbstatus_source += ' utils/status_profile.c'
-else:
- smbstatus_source += ' utils/status_profile_dummy.c'
-
-bld.SAMBA3_BINARY('smbstatus',
- source=smbstatus_source,
- deps='''
- talloc
- smbconf
- popt_samba3
- cmdline_contexts
- smbd_base
- LOCKING
- PROFILE
- ''')
-
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source='''
torture/torture.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list