summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-03-25 16:02:54 +0100
committerVolker Lendecke <vl@samba.org>2010-03-25 16:40:44 +0100
commit5a88e43c693f9e0c5dd93e4fd238364262643b5a (patch)
treead3d17a1ea68bc7a6923e1441defdd316023b552 /source3/smbd/server.c
parented189459b9d7776700ffd353f81b283232940199 (diff)
downloadsamba-5a88e43c693f9e0c5dd93e4fd238364262643b5a.tar.gz
samba-5a88e43c693f9e0c5dd93e4fd238364262643b5a.tar.bz2
samba-5a88e43c693f9e0c5dd93e4fd238364262643b5a.zip
s3: Make sure our CLEAR_IF_FIRST optimization works for serverid.tdb
In the child, we fully re-open serverid.tdb, which leads to one fcntl lock for CLEAR_IF_FIRST detection per smbd. This opens the tdb in the parent and holds it, so that tdb_reopen_all correctly catches the CLEAR_IF_FIRST bit.
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 145dd5f5d5..e5cfc27794 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1304,6 +1304,10 @@ extern void build_options(bool screen);
exit(1);
}
+ if (!serverid_parent_init()) {
+ exit(1);
+ }
+
namecache_enable();
if (!W_ERROR_IS_OK(registry_init_full()))