summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-03s3: Fix an assert to trigger in close_remove_share_modeStefan Metzmacher1-6/+17
In case we have a left-over entry in the share mode entry array, the SMB_ASSERT(got_tokens) is likely to kick in. It happens when we are about to delete a file with initial delete on close. We don't have a delete on close token set in the locking.tdb record. We see the fsp->initial_delete_on_close set, add the delete_on_close token to lck. Then "delete_file" is being set to true. Then later on we do the notify_deferred_opens. This walks the list, also checking for share_mode_stale_pid. We have already deleted our own share mode entry, share_mode_stale_pid() sees the left-over entry. It not also deletes that one but also the delete on close token. This leads to a different view of "delete_file" a.k.a. "got_tokens" further down in close_remove_share_mode, leading the SMB_ASSERT to fire. This patch attempts to fix the issue by keeping around our own share mode entry for almost the whole routine, preventing share_mode_stale_pid() from removing the delete tokens. Pair-Programmed-With: Volker Lendecke <vl@samba.org>
2012-06-03s3: Do an early return in close_remove_share_modeVolker Lendecke1-2/+1
Without "lck" we don't have much to clean up Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-03s3: Make close_remove_share_mode a bit more readableVolker Lendecke1-2/+4
by introducing a variable simplifying a boolean expression Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-03s3: Simplify get_delete_on_close_token moreVolker Lendecke1-6/+2
All remaining callers actually want the token Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-03s3: Simplify get_delete_on_close_token slightlyVolker Lendecke1-19/+32
Introduce find_delete_on_close_token. Thus is_delete_on_close_set does not have to call get_delete_on_close_token anymore. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-03s3: Slightly simplify close_remove_share_modeVolker Lendecke1-10/+15
Remove a level of indentation by more use of "continue;" Signed-off-by: Stefan Metzmacher <metze@samba.org>
2012-06-03s3:smbd/close: avoid procid_is_me()Stefan Metzmacher1-1/+2
metze
2012-06-03s3:smbd/open: avoid procid_is_me()Stefan Metzmacher1-4/+5
metze
2012-06-03s3:smbd/oplock: avoid procid_is_me()Stefan Metzmacher1-2/+4
metze
2012-06-03build: Match autoconf build and disable ACLs on MacOS (darwin)Andrew Bartlett1-3/+7
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 16:03:59 CEST 2012 on sn-devel-104
2012-06-03lib/krb5_wrap: Remove unused smb_krb5_get_credsAndrew Bartlett2-125/+0
Found by callcatcher This has been unsused since commit 61f0b247633501d6bf4103ca8345048e537c043d Author: Günther Deschner <gd@samba.org> Date: Thu Nov 12 15:42:03 2009 +0100 s3-kerberos: remove smb_krb5_get_tkt_from_creds(). Now that cli_krb5_get_ticket() already handles S4U2SELF impersonation, remove smb_krb5_get_tkt_from_creds() which is not required anymore. Guenther Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 13:04:06 CEST 2012 on sn-devel-104
2012-06-03librepace: put #defines after #include "sys/xattr.h"Andrew Bartlett2-40/+8
This avoids redefining the system xattr functions, which should fix MacOS. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 09:46:44 CEST 2012 on sn-devel-104
2012-06-03lib/replace: Undo change of 0 -> NULLAndrew Bartlett1-1/+1
This reverts part of e9d797e153ae95561dbb10b56a41281b2472f137 as in the autoconf tests, NULL isn't available! (it is available in waf, which caused confusion) Andrew Bartlett
2012-06-03s3-libnetapi: Cope with popt versions without POPT_TABLEENDAndrew Bartlett2-0/+8
2012-06-03libreplace: Fix up MacOS xattr functionsAndrew Bartlett1-0/+18
We need undo the rep_ macro to call the real OS function. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 06:21:21 CEST 2012 on sn-devel-104
2012-06-03s3-build: Remove finddeadAndrew Bartlett1-9/+0
This won't work with the new tree structure, and we have the same output at https://build.samba.org/lcov/data/coverage/samba_4_0_test/unused-fns.txt Using the callcatcher framework. Andrew Bartlett
2012-06-03libreplace: Link libreplace against attr when requiredAndrew Bartlett2-2/+9
The autoconf Samba build will return to over-linking with -lattr on systems with both the XFS compat API and native xattrs. Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 03:56:05 CEST 2012 on sn-devel-104
2012-06-03libreplace: Use true rather than True in xattr.cAndrew Bartlett1-2/+2
This should fix the build on IRIX. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sun Jun 3 02:05:35 CEST 2012 on sn-devel-104
2012-06-02libreplace: Fix build on MacOS where we have the same fn name but more argumentsAndrew Bartlett1-8/+8
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Jun 2 15:52:51 CEST 2012 on sn-devel-104
2012-06-02libreplace: Solaris needs system/dir.h for that xattr wrapper implementationAndrew Bartlett1-0/+1
2012-06-02build: Remove check for res_ninit (Revert "s3: Check for res_ninit")Andrew Bartlett1-8/+0
This reverts commit 4f6b1e8c81776cf1fa386574e60e54fe6b4fe82e because I cannot find any use of this configure check, and it is one of the differences between the WAF and autoconf builds. Andrew Bartlett
2012-06-02build: Show extra configure results found by WAF as wellAndrew Bartlett1-1/+3
This may assist in debugging a difference in a configure test on the build farm. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Jun 2 09:46:09 CEST 2012 on sn-devel-104
2012-06-02ccan: fix autoconf test for isblank()Andrew Bartlett1-6/+6
The define in the C code is HAVE_ISBLANK Andrew Bartlett
2012-06-02libreplace: Add missing tests for HAVE_MREMAP and HAVE_SHARED_MMAPAndrew Bartlett1-0/+10
2012-06-02libreplace: Fix autoconf build on platforms needing xattrsAndrew Bartlett1-1/+1
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Jun 2 07:23:32 CEST 2012 on sn-devel-104
2012-06-02build: Check correctly for sendfile (missing .h in header)Andrew Bartlett1-1/+1
This will hopefully fix the build on SLES8, which does not support 64-bit sendfile. Andrew Bartlett
2012-06-02lib/replace: Relicence xattr.c to LGPLv3Andrew Bartlett1-11/+14
By the kind consent of the copyright holders. (There wasn't any code from tridge in the code brought in from source3/lib/system.c). Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Sat Jun 2 04:00:42 CEST 2012 on sn-devel-104
2012-06-02build: Always attempt to build posix ACLsAndrew Bartlett1-8/+3
These are on more systems than just linux. If the configure test passes then assume it is available. Andrew Bartlett
2012-06-02lib/replace: Merge remaining xattr test details from lib/utilAndrew Bartlett6-40/+34
I prefer the longer XATTR_ADDITIONAL_OPTIONS define and the NULL rather than 0 values in the getxattr test. Andrew Bartlett
2012-06-02s4-xattr: Use libreplace xattr functions directlyAndrew Bartlett10-182/+18
2012-06-02lib/replace: xattr wrappers in lib/replace rather than source3/lib/system.cAndrew Bartlett9-791/+191
This also moves all the still-used configure tests etc. The unused OSF API is also removed at this time. Andrew Bartlett
2012-06-02lib/replace: We cannot use strchr_m in lib/replaceAndrew Bartlett1-6/+6
In any case, it is always safe to search for . even in a multibyte string. Andrew Bartlett
2012-06-02lib/replace: DEBUG is not acceptable here, as this may not be linked into SambaAndrew Bartlett1-7/+0
2012-06-02lib/replace: Copy lib/system.c xattr wrappers to lib/replaceAndrew Bartlett1-0/+703
2012-06-02s3: Same fix as 8576256, this time for fgetxattrVolker Lendecke1-1/+1
Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Jun 2 02:12:31 CEST 2012 on sn-devel-104
2012-06-01s3: Avoid a lot of calls to serverid_exists()Volker Lendecke1-1/+1
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Fri Jun 1 18:58:30 CEST 2012 on sn-devel-104
2012-06-01Revert "waf-mitkrb5: enable dcerpc_server library to support OpenChange ↵Alexander Bokovoy3-41/+23
client code" This reverts commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246. After discussing with Julien (Openchange) and Metze, I decided to revert this code. Instead I made a patch to Openchange which allows to build client side only. Openchange server code requires working s4 member DC and --without-ad-dc build does not provide working provisioning even if we enable dcerpc_server and end point mapper. Autobuild-User: Alexander Bokovoy <ab@samba.org> Autobuild-Date: Fri Jun 1 16:46:08 CEST 2012 on sn-devel-104
2012-06-01waf: check for krb5_create_checksum and krb5_creds.flags for some Heimdal ↵Alexander Bokovoy4-3/+29
versions Signed-off-by: Andreas Schneider <asn@samba.org> Autobuild-User: Andreas Schneider <asn@cryptomilk.org> Autobuild-Date: Fri Jun 1 11:23:21 CEST 2012 on sn-devel-104
2012-06-01waf-mitkrb5: enable dcerpc_server library to support OpenChange client codeAlexander Bokovoy3-23/+41
Signed-off-by: Andreas Schneider <asn@samba.org>
2012-06-01.gitignore: remove already-gone gen-8bit-gap.shAndrew Bartlett1-1/+0
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Fri Jun 1 04:53:53 CEST 2012 on sn-devel-104
2012-06-01build: Add automatic compare of config.h files to recursive waf buildAndrew Bartlett3-4/+27
This uses the fact that we have both build systems running at the same time. The krb5 checks are skipped because we typically are comparing internal Heimdal with the system krb5, so they do not make sense. The required checks for krb5 are pretty well understood in any case, as we have a limited set of supported libraries. Andrew Bartlett
2012-06-01Remove an unused variable.Jeremy Allison1-3/+1
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Jun 1 03:03:12 CEST 2012 on sn-devel-104
2012-05-31Forward port of Richard Sharpe's <realrichardsharpe@gmail.com> fix for bug ↵Jeremy Allison5-4/+16
#8970 - Possible memory leaks in the samba master process.
2012-05-31We are triggering the cleanup_timeout_fn() too often, on exiting when an ↵Jeremy Allison1-11/+4
smbd is idle. Calls to exit_server_cleanly() should be treated as a "clean" shutdown, and not trigger the master smbd to call cleanup_timeout_fn.
2012-05-31s3:smbd: use server_messaging_context() instead of sconn->msg_ctx in ↵Stefan Metzmacher1-2/+3
exit_server_common() sconn is not available in the parent anymore. Thanks to Volker Lendecke <vl@samba.org> for finding this! metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu May 31 18:08:06 CEST 2012 on sn-devel-104
2012-05-31s3:vfs_hpuxacl: remove unused file_find_fd() callsStefan Metzmacher1-18/+2
metze
2012-05-31wintest: use (renamed) smbclient4 tool as smbclientMichael Adam2-2/+2
Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Thu May 31 13:23:34 CEST 2012 on sn-devel-104
2012-05-31wintest: introduce a variable to contain the (relative) path of smbclientMichael Adam3-43/+53
2012-05-31s3: Fix some 64-bit warningsVolker Lendecke2-4/+4
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu May 31 10:06:56 CEST 2012 on sn-devel-104
2012-05-31build: rename build targets smbclient -> smbclient4 and smbclient3 -> smbclientMichael Adam3-4/+4
Autobuild-User: Michael Adam <obnox@samba.org> Autobuild-Date: Thu May 31 06:36:55 CEST 2012 on sn-devel-104