sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code
85,241 Commits 60 Branches 1,144 Tags 452 MiB
11e716ae07
Commit Graph

196 Commits

Author SHA1 Message Date
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
Karolin Seeger
b22b22dcca brlock_tdb.c: Fix typo in comment. 
redundent -> redundant

Signed-off-by: Karolin Seeger <kseeger@samba.org>
 2013-02-18 22:07:39 +11:00
Jelmer Vernooij
d3b4c2c771 UTIL_TDB: lowercase name. 
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Thu May  3 20:18:22 CEST 2012 on sn-devel-104
 2012-05-03 20:18:22 +02: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
Matthias Dieter Wallnöfer
02a08d5cd5 s4:ntvfs common - remove two outdated function prototypes 
The two functions don't exist anymore.

Reviewed-by: Jelmer

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Sep 20 20:16:29 CEST 2011 on sn-devel-104
 2011-09-20 20:16:29 +02:00
Matthias Dieter Wallnöfer
7c44039f48 s4:ntvfs common - add "UTIL_TDB" and "tdb-wrap" as internal build dependency 
These modules are required for both header and source code files (see
bug #8468).

Reviewed-by: Jelmer
 2011-09-20 18:43:06 +02:00
Matthias Dieter Wallnöfer
fcfde9ac86 s4:ntvfs/common/brlock.c - remove unnecessary include "tdb_compat.h" 
Attempt to fix bug #8468
(https://bugzilla.samba.org/show_bug.cgi?id=8468).

Reviewed-by: Jelmer

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Mon Sep 19 18:03:24 CEST 2011 on sn-devel-104
 2011-09-19 18:03:24 +02:00
Stefan Metzmacher
1ba5077e5f s4:ntvfs: s/== PROTOCOL_SMB2/>= PROTOCOL_SMB2_02/ 
metze
 2011-09-05 13:17:33 +02:00
Rusty Russell
058c4f8492 tdb_fetch_compat: use instead of tdb_fetch. 
This is a noop for tdb1.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
 2011-06-20 11:18:35 +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
a772797a38 librpc/idr Use the Samba3 notify.idl in common. 
The extra fields in the structure that Samba4 does not use should not
bother it.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>
 2011-06-09 12:40:08 +02:00
Andrew Bartlett
1969aa8eac s4-ntvfs: Rename brl_*() -> brlock_*() to avoid conflict with brlock_init in s3 2011-05-08 10:56:26 +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
Jelmer Vernooij
f5c3742a4c source4/ntvfs: Fix prototypes for all functions. 2011-03-19 03:20:05 +01: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
Pavel Shilovsky
738b2abe78 s4: Don't grant level II oplock to a file with byte-range locks. 
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Feb 15 11:09:17 CET 2011 on sn-devel-104
 2011-02-15 11:09:17 +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 Bartlett
6c726745a4 s4:ntvfs rename notify.idl to s4_notify.idl until we can merge this IDL 
This IDL is almost common, but the source3 version has a
hand-marshalled server_id.  The s3compat build has problems with two
different idl files of the same name.

Andrew Bartlett
 2010-05-24 23:08:11 +10:00
Jelmer Vernooij
f9ca9e46ad Finish removal of iconv_convenience in public API's. 2010-05-18 11:45:30 +02: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
Andrew Tridgell
e5c83e1adb s4-ntvfs: use TYPESAFE_QSORT() in notify code 2010-02-13 22:36:12 +11:00
Andrew Tridgell
186ea099c5 s4-ntvfs: move valid lock range test from smb2 layer to generic code 
win7 also fails invalid lock ranges on SMB
 2009-11-27 19:42:10 +11:00
Stefan Metzmacher
33e8f47725 s4:ntvfs/common: s/private/private_data 
metze
 2009-02-02 13:08:32 +01:00
Stefan Metzmacher
183c379fe5 s4:lib/tevent: rename structs 
list=""
list="$list event_context:tevent_context"
list="$list fd_event:tevent_fd"
list="$list timed_event:tevent_timer"

for s in $list; do
	o=`echo $s | cut -d ':' -f1`
	n=`echo $s | cut -d ':' -f2`
	r=`git grep "struct $o" |cut -d ':' -f1 |sort -u`
	files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4`
	for f in $files; do
		cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp
		mv $f.tmp $f
	done
done

metze
 2008-12-29 20:46:40 +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
Stefan Metzmacher
a7036d2bd0 s4: Revert "r24284: change brlock_tdb.c to use the dbwrap API. This actually makes the" 
This reverts commit 4792285282.

Conflicts:

	source4/ntvfs/common/brlock_tdb.c
	source4/ntvfs/common/config.mk
 2008-12-29 14:46:06 +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
Jelmer Vernooij
9565999755 Fix include paths to new location of libutil. 2008-10-11 21:31:42 +02:00
Jelmer Vernooij
8ec93160d5 Fix last few includes to use new tdb location. 2008-09-16 16:09:50 +02:00
Andrew Tridgell
70219bee13 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test 
(This used to be commit 9d74201e46)
 2008-06-03 15:11:42 -07:00
Stefan Metzmacher
0827b08a43 opendb: add write time handling 
metze
(This used to be commit 3868d8ce63)
 2008-06-03 14:03:49 +02:00
Andrew Tridgell
1bdd08227e smbpid needs to be 32 bit now to cope with SMB2 
(This used to be commit a2854fd6ea)
 2008-06-02 11:03:19 +10:00
Jelmer Vernooij
60ae8f0657 Fix a bunch of dependencies. 
(This used to be commit a63f458462)
 2008-05-18 23:40:23 +02:00
Jelmer Vernooij
4c70cda986 Fix a couple (well, little more than that..) of typos. 
(This used to be commit a6b5211994)
 2008-05-18 23:02:47 +02:00
Jelmer Vernooij
4c8756f147 Create prototype headers from Makefile directory, without smb_build in the middle. 
(This used to be commit f4a77b96f9)
 2008-05-18 22:30:08 +02:00
Jelmer Vernooij
03643aec88 Use variables for source directory in a couple more places. 
(This used to be commit c41bd3005f)
 2008-05-18 19:54:27 +02:00
Jelmer Vernooij
c15ffa27cb Explicitly require event context to be specified. 
(This used to be commit a95a71fe45)
 2008-04-17 01:19:53 +02:00
Jelmer Vernooij
e9017ba418 Use _OBJ_FILES variables in a couple more places. 
(This used to be commit 92856d5054)
 2008-04-14 17:22:58 +02:00
Jelmer Vernooij
afe3e8172d Install public header files again and include required prototypes. 
(This used to be commit 47ffbbf674)
 2008-04-02 04:53:27 +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
49c86b73bf opendb_tdb: use sys_lease to setup kernel oplocks 
metze
(This used to be commit e473068bdd)
 2008-03-12 17:35:06 +01: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
db06d932c8 opendb_tdb: keep struct opendb_file arround for the lifetime of struct odb_lock 
That means we only have to parse the record once
and as the tdb record is locked the in memory copy
is always the same as the one in the tdb.

metze
(This used to be commit 0641a43cd6)
 2008-03-08 09:28:17 +01:00
Stefan Metzmacher
11fb55e8a4 opendb_tdb: correctly initialize modified to false 
Otherwise this variable would never change its value...

metze
(This used to be commit 5b13a564b8)
 2008-03-08 09:28:17 +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
6c27daeeca opendb_tdb: pass down struct messaging_context directly to odb_oplock_break_send() 
metze
(This used to be commit c993b07f7d)
 2008-03-07 19:15:21 +01:00