1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Commit Graph

137 Commits

Author SHA1 Message Date
Michael Adam
31c2336519 s4:cluster: use DBWRAP_LOCK_ODER_NONE for local_db_tmp_open()
Make lack of lock oder checking more visible.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-02-07 16:06:07 +01:00
Michael Adam
7e766a0a8a dbwrap: add dbwrap_flags argument to dbwrap_local_open()
To be consistent with db_open() and prepare for future
possible extensions.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-02-07 16:06:07 +01:00
Rusty Russell
ed6a4e04e1 source4/cluster and source4/ntvfs: convert to dbwrap, add ntdb option.
This makes the code use dbwrap_local_open(), so it can handle
NTDB.

brlock.tdb, notify.tdb and openfiles.tdb can now be brlock.ntdb,
notify.ntdb and openfiles.ntdb, if 'use ntdb' is set.

Cc: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Jeremy Allison <jra@samba.org>
2013-04-12 14:59:42 -07:00
Rusty Russell
316e5e376c lib/tdb_wrap: use tdb directly, not tdb_compat.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-06-19 05:38:07 +02:00
Andrew Bartlett
f10c638100 s4-messaging: Fill in the whole server_id in all use cases
This started per https://bugzilla.samba.org/show_bug.cgi?id=8872#c4
and avoids any possible collision with a different process.

We also need to ensure that across a Samba installation on a single
node that id.vnn is the same.  Samba4 previously used 0, while Samba3
used NONCLUSTER_VNN.  When a message is sent between these 'different'
nodes, the error NT_STATUS_INVALID_DEVICE_REQUEST is raised.

Andrew Bartlett
2012-04-30 17:55:11 +10:00
Jelmer Vernooij
ce4531ee31 tdb_wrap: Move to specific directory.
It's a bit confusing to mix low-level and high-level libraries.  We had
multiple libraries in one directory, and there were have circular
dependencies with other libraries outside that directory (in this case,
samba-hostconfig).

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104
2012-03-10 23:13:01 +01:00
Andrew Bartlett
01c934c81e lib/util: Add back control of mmap and hash size in tdb for top level build
This passes down a struct loadparm_context to allow these
parameters to be checked.  This may be s3 or s4 context, allowing the
#if _SAMBA_BUILD_ macro to go away safely.

Andrew Bartlett
2011-10-13 14:06:07 +02:00
Rusty Russell
0e4c358e27 tdb_compat.h: divert every tdb build and includes to tdb_compat
We change all the headers and wscript files to use tdb_compat; this
means we have one place to decide whether to use TDB1 or TDB2.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-06-20 11:18:34 +02:00
Andrew Bartlett
16b1c77644 lib/util Bring procid_str() into lib/util as server_id_string()
This is needed for OpenChange, which prints Samba struct server_id
values in debug messages.

Andrew Bartlett
2011-06-09 12:40:09 +02:00
Andrew Bartlett
d057116cc2 server_id.idl: Bring server_id.idl in common
Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-06-09 12:40:08 +02:00
Andrew Bartlett
8d803d5a0a s4-cluster Use task_id instead of id2 to clarify server_id structure
This seems a clearer and more acceptable name.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-06-09 12:40:08 +02:00
Andrew Bartlett
1475013963 lib/util Move source3 tdb_wrap_open() into the common code.
This #if _SAMBA_BUILD == 3 is very unfortunate, as it means that in
the top level build, these options are not available for these
databases.  However, having two different tdb_wrap lists is a worse
fate, so this will do for now.

Andrew Bartlett
2011-05-06 07:51:24 +02:00
Andrew Bartlett
cdd802af83 s4-messaging Rename messaging -> imessaging
This avoid symbol and structure conflicts between Samba3 and Samba4,
and chooses a less generic name.

Andrew Bartlett
2011-05-03 07:37:07 +02:00
Andrew Bartlett
4c8de5ab13 s4-cluster Rename server_id.node -> vnn to match Samba3 2011-05-03 07:37:07 +02:00
Andrew Bartlett
f13b7ec079 s4-cluster: Remove const from cluster_id_string()
This allows the caller to talloc_free() this result.

Andrew Bartlett
2011-05-03 07:37:06 +02:00
Andrew Bartlett
85eb4377db s4:cluster Rename .id to .pid in server_id
This also changes some DEBUG messages to use cluster_id_string()
rather than .id, to isolate them from this and other changes.

Andrew Bartlett
2011-05-03 07:37:06 +02:00
Jelmer Vernooij
136c160064 Use <tdb.h> to include tdb, so the system include file gets used when building against
system tdb.
2011-02-28 21:11:21 +01:00
Andrew Tridgell
bed374215f s4-idl: rename s4 server_id.idl to server_id4.idl
this avoids a conflict with the new s3 server_id.idl

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-02-18 18:41:00 +11:00
Matthias Dieter Wallnöfer
55dba7bd16 s4:cluster/cluster.h - fix another gcc 3.4 "struct" warning
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Dec  5 21:22:18 CET 2010 on sn-devel-104
2010-12-05 21:22:18 +01:00
Jelmer Vernooij
3deece5591 s4: Remove the old perl/m4/make/mk-based build system.
The new waf-based build system now has all the same functionality, and
the old build system has been broken for quite some time.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
2010-10-31 02:01:44 +00:00
Andrew Tridgell
87b3d384c6 s4-cluster: make cluster a private shared lib 2010-10-30 23:49:01 +11:00
Andrew Tridgell
b690fedef5 s4-waf: removed the AUTOGENERATED markers
we won't be using the mk -> wscript generator again
2010-04-06 20:27:16 +10:00
Andrew Tridgell
f9eae32f4b s4-waf: mark the wscript files as python so vim/emacs knows how to highlight them 2010-04-06 20:27:11 +10:00
Andrew Tridgell
845e0cbe6f build: commit all the waf build files in the tree 2010-04-06 20:26:48 +10:00
Stefan Metzmacher
d0ad2ecdea s4:cluster: s/private/private_data
metze
2009-02-02 13:08:41 +01:00
Stefan Metzmacher
60b366369e s4:cluster: fix dependency to TDB_WRAP
metze
2008-12-29 20:55:02 +01:00
Stefan Metzmacher
e36d64728f s4:cluster: remove old/broken ctdb code
We don't need a full copy of ctdb...
If we want to readd cluster support,
we should just use a ctdb client library.

metze
2008-12-29 14:46:09 +01:00
Jelmer Vernooij
8df6af213a Use 32-bit smbpid in interface as required by SMB2, in line with
1bdd08227e.
2008-12-23 23:02:54 +01:00
Stefan Metzmacher
081f8883ba s4: fix LIBEVENTS dependencies and use more forward declarations
We should only include events.h where we really need it
and prefer forward declarations of 'struct event_context'

metze
2008-12-17 11:04:45 +01:00
Jelmer Vernooij
0f04beff33 Rename dom_sid.idl -> server_id.idl (since it no longer actually contains the dom_sid). No longer include it from security.idl. 2008-12-16 15:36:18 +01:00
Jelmer Vernooij
87ec1d2532 Make sure prototypes are always included, make some functions static and
remove some unused functions.
2008-10-20 18:59:51 +02:00
Jelmer Vernooij
aaa3e0425d Fix includes. 2008-10-15 02:52:10 +02:00
Jelmer Vernooij
9565999755 Fix include paths to new location of libutil. 2008-10-11 21:31:42 +02:00
Jelmer Vernooij
6a689c23e8 Rename smbd -> samba.
This reverts commit 05ea5e23cf.

Conflicts:

	source4/smbd/server.c
2008-09-24 03:16:15 +02:00
Jelmer Vernooij
8ec93160d5 Fix last few includes to use new tdb location. 2008-09-16 16:09:50 +02:00
Jelmer Vernooij
7111645d3c Use single copy of tdb in both samba3 and samba4. 2008-09-16 15:16:31 +02:00
Simo Sorce
2daf2897d5 Use a custom init function for samba4 that sets a samba4
specific debug function.
By default do not debug, this is the most appropriate action for a library
as we cannot assume what stderr is use for in the main app.
The main app is responsible to set ev_debug_stderr if they so desire.
(This used to be commit e566a2f308)
2008-06-14 13:00:53 -04:00
Stefan Metzmacher
0827b08a43 opendb: add write time handling
metze
(This used to be commit 3868d8ce63)
2008-06-03 14:03:49 +02:00
Jelmer Vernooij
137ec6e340 Use variables for source directory in a couple more places.
(This used to be commit 2860a7db59)
2008-05-18 19:46:09 +02:00
Andrew Tridgell
107ab090e2 use uintptr_t instead of intptr_t where appropriate
(This used to be commit d62f2bcc85)
2008-04-17 14:47:07 +02:00
Jelmer Vernooij
ffc5cbfe80 Move object files lists to makefile rather than smb_build.
(This used to be commit 5628d58990)
2008-04-14 16:53:00 +02:00
Andrew Bartlett
7f2927528c Fix references to ntvfs share config
Andrew Bartlett
(This used to be commit 4e4152dfd7)
2008-03-27 20:40:40 +11:00
Andrew Bartlett
4fc27c9969 Make oplocks a per-share option.
This even goes via the share options system (a very odd layer of indirection).

Andrew Bartlett
(This used to be commit f2c65f9907)
2008-03-27 20:32:02 +11:00
Stefan Metzmacher
59917521e9 opendb: pass down a pointer to the fd in odb_open_file()
This prepares kernel oplock support.

metze
(This used to be commit 9db9b6d85d)
2008-03-12 17:35:04 +01:00
Stefan Metzmacher
e5e799aeb6 opendb: force odb_can_open() before odb_open_file()
Now there's only odb_can_open() which handles the
share_access rules.

And odb_open_file() only adds the new opendb_entry into the
database and calculates the granted oplock level.

metze
(This used to be commit db0853ae4f)
2008-03-07 19:35:12 +01:00
Stefan Metzmacher
b7db5f7cb5 opendb: add allow_level_II_oplock parameter to odb_open_file()
Not all clients support a fallback to level II oplocks.

metze
(This used to be commit 146f1fe0b6)
2008-03-06 17:19:12 +01:00
Stefan Metzmacher
98dafd5eb1 opendb: add odb_get_path()
metze
(This used to be commit 02071f151a)
2008-02-29 15:17:52 +01:00
Stefan Metzmacher
bc1b595555 opendb: only return delete_on_close on odb_get_delete_on_close()
metze
(This used to be commit e699633db2)
2008-02-28 08:11:04 +01:00
Stefan Metzmacher
85d58175c8 opendb: return the path that should be deleted in odb_close_file()
That means the last close returns the path name if the
delete_on_close flag is set.

metze
(This used to be commit fc27730bad)
2008-02-28 08:10:50 +01:00
Stefan Metzmacher
7264a8b7ca opendb: unify the parameters of odb_open_file() and odb_can_open()
metze
(This used to be commit e6b708a52b)
2008-02-26 09:32:56 +01:00