summaryrefslogtreecommitdiffstats
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2008-01-29 16:19:21 +0300
committerAlexander Bokovoy <ab@samba.org>2008-01-29 16:19:21 +0300
commitef2d66bd1d1009ab4747cb4b7fc5533d44475c02 (patch)
treeaab3a8d500fa2ff1e542aef8ac9f7a7af520b8e6 /source3/smbd/server.c
parentd9a1282cc5e4a44495ec8ce20ef6dad6dc79c96b (diff)
parenteba5fbff749b84a3e1bcd1f849c3454417532454 (diff)
downloadsamba-ef2d66bd1d1009ab4747cb4b7fc5533d44475c02.tar.gz
samba-ef2d66bd1d1009ab4747cb4b7fc5533d44475c02.tar.xz
samba-ef2d66bd1d1009ab4747cb4b7fc5533d44475c02.zip
Merge branch 'ctdb-merge' into dmapi-integration
(This used to be commit 58dce4cdf277c8c68865185d9d8b4faea996dd3e)
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index db241103ed..7116027adf 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1313,12 +1313,6 @@ extern void build_options(bool screen);
if ( is_daemon && !interactive )
start_background_queue();
- /* Always attempt to initialize DMAPI. We will only use it later if
- * lp_dmapi_support is set on the share, but we need a single global
- * session to work with.
- */
- dmapi_init_session();
-
if (!open_sockets_smbd(is_daemon, interactive, ports))
exit(1);