[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6ce362a build: Ensure -Werror=format works with -Wformat=2 on NULL
format strings
from a7b8e9f5 s4-dsdb: Ensure we always free tmp_ctx in schema refresh
check
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6ce362afeff0cb5094eb6b1ecfa639252cdcc7f8
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 17 20:43:07 2012 +1000
build: Ensure -Werror=format works with -Wformat=2 on NULL format strings
This should fix the build on some gcc versions, (noticed on FreeBSD by
Volker).
We want the protection of -Werror=format without the errors extending
to the format string itself being NULL, because that is valid for
ldb_search().
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Fri Aug 17 14:50:16 CEST 2012 on sn-devel-104
---
Summary of changes:
buildtools/wafsamba/samba_autoconf.py |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 03c2b24..50039fc 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -629,7 +629,7 @@ def SAMBA_CONFIG_H(conf, path=None):
# This check is because for ldb_search(), a NULL format string
# is not an error, but some compilers complain about that.
-if CHECK_CFLAGS(conf, -Werror=format, '''
+if CHECK_CFLAGS(conf, [-Werror=format, -Wformat=2], '''
int testformat(char *format, ...) __attribute__ ((format (__printf__, 1, 2)));
int main(void) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1b487ad s3:selftest: add some tests against a share the requires
encryption
via 45471f4 s3:smb2_negprot: annouce/negotiate SMB3 encryption support
via 9397d67 s3:smb2_server: add SMB3 encryption support
via 9f1dfd8 s3:smbd: don't disconnect the client when a share has smb
encrypt = required
via e5d4e8d s3:smbd: lp_smb_encrypt() returns SMB_SIGNING_* values
via 8b3da9a s3:smbd: make use of ENCRYPTION_REQUIRED()
via abf018e libcli/smb: make sure the SMB2_TRANSFORM pdu is complete
via e2b07c0 s4:libcli/smb2: reset trsnport-compound.related when a
compound chain is finished
from 6ce362a build: Ensure -Werror=format works with -Wformat=2 on NULL
format strings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1b487ad3d7f709b0a100ccdc6fc30dcf7d0b778c
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 08:50:21 2012 +0200
s3:selftest: add some tests against a share the requires encryption
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Fri Aug 17 16:34:26 CEST 2012 on sn-devel-104
commit 45471f4d8f80d80c01197536bcf47d932dcd38e0
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 8 07:07:53 2012 +0200
s3:smb2_negprot: annouce/negotiate SMB3 encryption support
metze
commit 9397d6709f79f2e8837401d32cd7ac584b6c5b24
Author: Stefan Metzmacher me...@samba.org
Date: Wed Aug 8 07:07:03 2012 +0200
s3:smb2_server: add SMB3 encryption support
metze
commit 9f1dfd8facaa59370afd93e89cc729de5cc3d9ba
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 09:42:27 2012 +0200
s3:smbd: don't disconnect the client when a share has smb encrypt =
required
It's not the client fault, if he doesn't know that encryption is required.
We should just return ACCESS_DENIED and let the client work on other
shares and open files on the current SMB connection.
metze
commit e5d4e8df6b8186b71aa72dd7817f5579b44fee2f
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 09:40:52 2012 +0200
s3:smbd: lp_smb_encrypt() returns SMB_SIGNING_* values
metze
commit 8b3da9a1f400040eef14b63ed0b7884a9e82d907
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 09:41:42 2012 +0200
s3:smbd: make use of ENCRYPTION_REQUIRED()
metze
commit abf018e8b64b237aa029978c20bd418524fff3d0
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 08:31:52 2012 +0200
libcli/smb: make sure the SMB2_TRANSFORM pdu is complete
metze
commit e2b07c0adca680d73f20744fd8dbbcb8be818ca3
Author: Stefan Metzmacher me...@samba.org
Date: Fri Aug 17 08:25:08 2012 +0200
s4:libcli/smb2: reset trsnport-compound.related when a compound chain is
finished
metze
---
Summary of changes:
libcli/smb/smbXcli_base.c | 15 ++-
selftest/knownfail |5 +
selftest/target/Samba3.pm |4 +
selftest/target/Samba4.pm |4 +
source3/include/smb_macros.h|2 +-
source3/param/loadparm.c|2 +-
source3/selftest/tests.py |9 +-
source3/smbd/globals.h | 52 --
source3/smbd/process.c | 10 +-
source3/smbd/smb2_negprot.c |8 +
source3/smbd/smb2_server.c | 350 +++
source3/smbd/trans2.c | 20 +--
source4/libcli/smb2/transport.c |1 +
13 files changed, 412 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index a9adcbb..02d0227 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -3041,6 +3041,7 @@ static NTSTATUS smb2cli_inbuf_parse_compound(struct
smbXcli_conn *conn,
struct smbXcli_session *s;
uint64_t uid;
struct iovec tf_iov[2];
+ size_t enc_len;
NTSTATUS status;
if (len SMB2_TF_HDR_SIZE) {
@@ -3053,9 +3054,16 @@ static NTSTATUS smb2cli_inbuf_parse_compound(struct
smbXcli_conn *conn,
taken += tf_len;
hdr = first_hdr + taken;
- len = IVAL(tf, SMB2_TF_MSG_SIZE);
+ enc_len = IVAL(tf, SMB2_TF_MSG_SIZE);
uid = BVAL(tf, SMB2_TF_SESSION_ID);
+ if (len SMB2_TF_HDR_SIZE + enc_len) {
+ DEBUG(10, (%d bytes left, expected at least
%d\n,
+ (int)len,
+ (int)(SMB2_TF_HDR_SIZE + enc_len)));
+ goto inval;
+ }
+
[SCM] Samba Shared Repository - annotated tag tevent-0.9.17 created
The annotated tag, tevent-0.9.17 has been created at 1a26605a546cf46e8bd97dca238403f17d9de695 (tag) tagging d7d8646e6352c3e28012e52bd926283b1d1a09c9 (commit) replaces samba-4.0.0beta6 tagged by Stefan Metzmacher on Fri Aug 17 16:41:19 2012 +0200 - Log - tevent: tag release tevent-0.9.17 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQLlgPAAoJEEeTkWETCEAlevYIAIP6aTKnqHc0uzH/S+GxczlG hyBriWmJ7JblqiQhvYG6eP47qa5xFyMV6buUxRQHf9U7vp6+Bnj1lCf1hOoeqk7L q8w0MQZ0ZVY/hqNKjE/Wl0X0ldKvQ0xQ8s8cEQXBvr3NEJpPmR+L3YDQ56A+3HGK zfqI5EWoU03e6d+S/RAm+ia6zGLDHWRQFPaNbQweuLSv0zyTsFapxuyM8iHKCqyu SUwK1x6WD/3Dbx5P1TMs39bvoOPLp0ERj97qFnNm69KlUqaIjam3mySDmW+B8I1U tx2cEt5oMxlnw8YzeWQ+qkho1RDxVe/FRQzE2VqQg0/VtY56E72ruTqCuRy7+Nc= =Ewm0 -END PGP SIGNATURE- Andrew Bartlett (55): VERSION: Move on to beta6! s4-dsdb: Add const s4-dsdb: Improve memory handling in kccsrv_find_connections() by adding a tmp_ctx s4-dsdb: Improve memory handling in kccsrv_add_connection() s4-dsdb: Improve memory handling in dsdb_schema_from_ldb_results() by adding a tmp_ctx s4-dsdb: Add mem_ctx argument to samdb_ntds_settings_dn s4-libnet: Improve debugging of libnet_BecomeDC LDAP errors s4-libnet: Prepare libnet_BecomeDC for samdb_reference_dn() returning an extended DN s4-dsdb: Use ldb_dn_copy() rather than talloc_reference() s4-dsdb: Add helper function samdb_reference_dn_is_our_ntdsa() s4-repl: Use samdb_reference_dn_is_our_ntdsa() s4-dsdb: Use samdb_reference_dn_is_our_ntdsa() s4-dsdb: Add samdb_dn_is_our_ntdsa() s4-dsdb: Use samdb_dn_is_our_ntdsa() s3-passdb: Silence scary DEBUG(0) message on first use of secrets.tdb databases selftest: Add knownfail for samba3.winbind.wbclient.wbcPingDc2 s3-smbd: Change allocation of smb_acl_t to talloc() pidl: Add mode_t as an alias so we can marshall posix ACL structures s3-smbd: Move smb_acl_t declaration to smb_acl.idl s3-smbd: Call sys_acl_get_perm() directly rather than via the VFS s3-smbd: Call sys_acl_get_permset() directly rather than via the VFS s3-smbd: Call sys_acl_get_tagtype() directly rather than via the VFS s3-smbd: Call sys_acl_get_qualifier() directly rather than via the VFS s3-smbd: Call sys_acl_free_qualifier() directly rather than via the VFS s3-smbd: Call sys_acl_get_entry() directly rather than via the VFS s3-smbd: Call sys_acl_free_qualifier() directly rather than via the VFS s3-smbd: Call sys_acl_free_acl() directly rather than via the VFS s3-smbd: Call sys_acl_init() directly rather than via the VFS s3-smbd: Call sys_acl_clear_perms() directly rather than via the VFS s3-smbd: Call sys_acl_add_perm() directly rather than via the VFS s3-smbd: Call sys_acl_create_entry() directly rather than via the VFS s3-smbd: Call sys_acl_set_tag_type() directly rather than via the VFS s3-smbd: Call sys_acl_set_qualifier() directly rather than via the VFS s3-smbd: Call sys_acl_set_permset() directly rather than via the VFS s3-smbd: Remove unused conn argument from convert_permset_to_mode_t() s3-smbd: Remove sys_acl_*() VFS wrapper functions s3-sysacls: Remove sys_acl_free_acl() and replace with TALLOC_FREE() s3-sysacls: Remove sys_acl_free_qualifier() as it is a no-op librpc/idl: Make smb_acl_t public so we can pull/push it as a blob s4-selftest: Fix test name for samba.tests.dcerpc.bare s3-vfs: ensure we strictly free the talloc_stackframe s3-vfs: Avoid loops in VFS modules: call _NEXT functions in xattr emulation s3-vfs: Set errno in xattr emulation fix printf warning in net connections s3-selftest: convert stream_depot vfstest driver into a subunit test s3-selftest: convert xattr-tdb-1 vfstest driver into a subunit test librpc/idl: Fix acl array definition in smb_acl_t s3-vfs: Add new VFS module to fake setting an ACL s3-vfs: Continue to make vfs_xattr_tdb non-recursive selftest: Extend xattr-tdb-1 vfstest to call stat s3-smbd: Do not check no_acl_syscall_error(errno) after sys_acl_init() s3-torture: Initialise fsp fully in vfstest open s3-torture: Use talloc more in vfstest s3-torture: Add ACL commands to vfstest s3-selftest: Add a seperate test for ACL tests using vfstest Arvid Requate (1): s4:ntp_signd: fix SEGV if SID cannot be found Christian Ambach (2): s3:vfs_gpfs: make sure parameters are set correctly for leases s3:brlock: give traverse_fn a proper name Christof Schmitt (6): s3-winbind: Pass ping-dc result to client s3-winbind: Return the DC name from DC_PING libwbclient: Add wbcPingDc2 wbinfo: Improve output of wbinfo --ping-dc libwbclient: Add test for wbcPingDc2 s3:vfs_gpfs: Fix
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2e1ab13 s4-dsdb: Use tmp_ctx in kccsrv_check_deleted to avoid
leaking memory onto part-dn
via 26bfe70 s4-kcc: Avoid use-after-free of dn and add tmp_ctx
from 1b487ad s3:selftest: add some tests against a share the requires
encryption
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2e1ab13f6ebb2c2cf746457d4783fe9bc5e86de0
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 17 23:04:56 2012 +1000
s4-dsdb: Use tmp_ctx in kccsrv_check_deleted to avoid leaking memory onto
part-dn
The confusing use of do_dn as a memory context while legitimate
created a bug when it was copied and modified to search on a DN from
long-term state.
By always using a temporary memory context it is clear what paramter
is the memory context.
This was found based on a log provided by Ricky Nance
ricky.na...@weaubleau.k12.mo.us. Thanks Ricky!
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Fri Aug 17 18:24:10 CEST 2012 on sn-devel-104
commit 26bfe70def9905674c74bfe6f9d687b243af4891
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 17 22:47:44 2012 +1000
s4-kcc: Avoid use-after-free of dn and add tmp_ctx
By using a tmp_ctx we are clearer about allocating temporary memory.
Andrew Bartlett
---
Summary of changes:
source4/dsdb/kcc/kcc_deleted.c | 17 +++--
source4/dsdb/kcc/kcc_periodic.c | 11 +--
2 files changed, 20 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/kcc/kcc_deleted.c b/source4/dsdb/kcc/kcc_deleted.c
index 0e1a428..63bb97c 100644
--- a/source4/dsdb/kcc/kcc_deleted.c
+++ b/source4/dsdb/kcc/kcc_deleted.c
@@ -83,30 +83,35 @@ NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s,
TALLOC_CTX *mem_ctx)
struct ldb_result *res;
const char *attrs[] = { whenChanged, NULL };
unsigned int i;
+ TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+ if (!tmp_ctx) {
+ return NT_STATUS_NO_MEMORY;
+ }
- ret = dsdb_get_deleted_objects_dn(s-samdb, mem_ctx, part-dn,
do_dn);
+ ret = dsdb_get_deleted_objects_dn(s-samdb, tmp_ctx, part-dn,
do_dn);
if (ret != LDB_SUCCESS) {
+ TALLOC_FREE(tmp_ctx);
/* some partitions have no Deleted Objects
container */
continue;
}
if (!do_fs ldb_dn_compare(ldb_get_config_basedn(s-samdb),
part-dn)) {
- ret = dsdb_search(s-samdb, do_dn, res, do_dn,
LDB_SCOPE_ONELEVEL, attrs,
+ ret = dsdb_search(s-samdb, tmp_ctx, res, do_dn,
LDB_SCOPE_ONELEVEL, attrs,
DSDB_SEARCH_SHOW_RECYCLED, NULL);
} else {
if (do_fs) {
DEBUG(1, (Doing a full scan on %s and looking
for deleted object\n,
ldb_dn_get_linearized(part-dn)));
}
- ret = dsdb_search(s-samdb, part-dn, res, part-dn,
LDB_SCOPE_SUBTREE, attrs,
+ ret = dsdb_search(s-samdb, tmp_ctx, res, part-dn,
LDB_SCOPE_SUBTREE, attrs,
DSDB_SEARCH_SHOW_RECYCLED,
(isDeleted=TRUE));
}
if (ret != LDB_SUCCESS) {
DEBUG(1,(__location__ : Failed to search for deleted
objects in %s\n,
-ldb_dn_get_linearized(do_dn)));
- talloc_free(do_dn);
+ldb_dn_get_linearized(do_dn)));
+ TALLOC_FREE(tmp_ctx);
continue;
}
@@ -134,7 +139,7 @@ NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s,
TALLOC_CTX *mem_ctx)
}
}
- talloc_free(do_dn);
+ TALLOC_FREE(tmp_ctx);
}
return NT_STATUS_OK;
diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c
index f96347f..8f705d7 100644
--- a/source4/dsdb/kcc/kcc_periodic.c
+++ b/source4/dsdb/kcc/kcc_periodic.c
@@ -70,10 +70,16 @@ static bool check_MasterNC(struct kccsrv_partition *p,
struct repsFromToBlob *r,
struct repsFromTo1 *r1 = r-ctr.ctr1;
struct GUID invocation_id = r1-source_dsa_invocation_id;
unsigned int i, j;
+ TALLOC_CTX *tmp_ctx;
/* we are expecting only version 1 */
SMB_ASSERT(r-version == 1);
+ tmp_ctx = talloc_new(p);
+ if (!tmp_ctx) {
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f46c4df s3:vfs_tsmsm only send notifications when file was offline
before
via dda4c5d s3: Adapt the tsmsm module to the new aio routines
via d1e1f82 s3-vfs: Fix calls of lp_parm_talloc_string
via 3755a41 s3: Remove the gpfs_hsm_notify module
via 2c3a58d s3: Merge vfs_gpfs_hsm_notify into vfs_gpfs.c
from 2e1ab13 s4-dsdb: Use tmp_ctx in kccsrv_check_deleted to avoid
leaking memory onto part-dn
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f46c4dfe28831a6e8d610589c0d45193070c4864
Author: Christian Ambach a...@samba.org
Date: Fri Aug 17 17:40:24 2012 +0200
s3:vfs_tsmsm only send notifications when file was offline before
Autobuild-User(master): Christian Ambach a...@samba.org
Autobuild-Date(master): Fri Aug 17 20:05:30 CEST 2012 on sn-devel-104
commit dda4c5d7945e5538588b9a59a456a4e5eb63daf6
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 10 11:33:54 2012 +0200
s3: Adapt the tsmsm module to the new aio routines
Signed-off-by: Christian Ambach a...@samba.org
commit d1e1f8224f578c9b92e81db6b93f4fb7af135138
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 8 11:23:12 2012 +0200
s3-vfs: Fix calls of lp_parm_talloc_string
Signed-off-by: Christian Ambach a...@samba.org
commit 3755a418ccee85d633aaac5047c007893ce63c73
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 8 10:38:36 2012 +0200
s3: Remove the gpfs_hsm_notify module
The functionality has been merged into vfs_gpfs
Signed-off-by: Christian Ambach a...@samba.org
commit 2c3a58db9e2149785486e6b6398615f2d226dc23
Author: Volker Lendecke v...@samba.org
Date: Wed Aug 8 00:32:35 2012 +0200
s3: Merge vfs_gpfs_hsm_notify into vfs_gpfs.c
It was separated out because formerly our async I/O was not properly
stackable. aio_fork could for example catch aio and not get aio_return
get through to vfs_gpfs
Signed-off-by: Christian Ambach a...@samba.org
---
Summary of changes:
packaging/RHEL-CTDB/configure.rpm |2 +-
packaging/RHEL-CTDB/samba.spec.tmpl |3 +-
source3/Makefile.in |5 -
source3/configure.in |2 -
source3/modules/vfs_gpfs.c| 190 +
source3/modules/vfs_gpfs_hsm_notify.c | 110 ---
source3/modules/vfs_tsmsm.c | 147 +++---
source3/modules/wscript_build |8 --
source3/wscript |2 +-
9 files changed, 326 insertions(+), 143 deletions(-)
delete mode 100644 source3/modules/vfs_gpfs_hsm_notify.c
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm
b/packaging/RHEL-CTDB/configure.rpm
index c2a0302..5e2b88e 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -51,7 +51,7 @@ CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE -O3 ./configure -C \
--without-smbwrapper \
--with-pam \
--with-quotas \
-
--with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs,vfs_tsmsm,vfs_gpfs_hsm_notify
\
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs,vfs_tsmsm \
--with-syslog \
--with-utmp \
--with-cluster-support \
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index a9111d2..80237e7 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -186,7 +186,7 @@ CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \
--without-smbwrapper \
--with-pam \
--with-quotas \
-
--with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs,vfs_tsmsm,vfs_gpfs_hsm_notify
\
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs,vfs_tsmsm \
--with-syslog \
--with-utmp \
--with-cluster-support \
@@ -416,7 +416,6 @@ exit 0
%{_libarchdir}/samba/vfs/fileid.so
%{_libarchdir}/samba/vfs/full_audit.so
%{_libarchdir}/samba/vfs/gpfs.so
-%{_libarchdir}/samba/vfs/gpfs_hsm_notify.so
%{_libarchdir}/samba/vfs/linux_xfs_sgid.so
%{_libarchdir}/samba/vfs/netatalk.so
%{_libarchdir}/samba/vfs/preopen.so
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b8b055a..57c6c1d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -882,7 +882,6 @@ VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
VFS_COMMIT_OBJ = modules/vfs_commit.o
VFS_GPFS_OBJ = modules/vfs_gpfs.o modules/gpfs.o modules/nfs4_acls.o
-VFS_GPFS_HSM_NOTIFY_OBJ = modules/vfs_gpfs_hsm_notify.o
VFS_NOTIFY_FAM_OBJ = modules/vfs_notify_fam.o
VFS_READAHEAD_OBJ = modules/vfs_readahead.o
VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
@@ -2849,10 +2848,6 @@ bin/gpfs.@SHLIBEXT@:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4f4bb1f s4:torture:basic: add more delete test - variants of deltest16 and deltest17 via c35bdb3 s3: add a debug message for failed execv in sys_popen() via 471a853 lib/util: add server_id_set_disconnected() and server_id_is_disconnected() via 3cdf441 lib/util: let server_id_str() skip the task_id if 0 in the cluster case too via 6457fb5 s3:lib: implement interpret_pid() as wrapper of server_id_from_string() via d4a0aeb lib/util: add server_id_from_string() via 6a58c5f s3:lib: implement serverid_equal() as macro of server_id_equal() via 8149623 lib/util: add server_id_equal() from f46c4df s3:vfs_tsmsm only send notifications when file was offline before http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4f4bb1f20d149e47ee1c6b5251b7376bb86ef530 Author: Michael Adam ob...@samba.org Date: Wed Aug 8 23:43:05 2012 +0200 s4:torture:basic: add more delete test - variants of deltest16 and deltest17 There seems to be a difference if the initial delete_on_close flag was set on a handle that created the file or if the handle if was for a file that already existed. Pair-Programmed-With: Stefan Metzmacher me...@samba.org Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Stefan Metzmacher me...@samba.org Autobuild-Date(master): Fri Aug 17 21:44:24 CEST 2012 on sn-devel-104 commit c35bdb34da91504a6ed2abe5355aebcab8b73181 Author: Michael Adam ob...@samba.org Date: Wed Aug 1 15:42:49 2012 +0200 s3: add a debug message for failed execv in sys_popen() Signed-off-by: Stefan Metzmacher me...@samba.org commit 471a853e343e336adb14a219fba2d2ead9a1db62 Author: Michael Adam ob...@samba.org Date: Mon Aug 6 16:35:46 2012 +0200 lib/util: add server_id_set_disconnected() and server_id_is_disconnected() Utility functions for handling the special placeholder server-id value for disconnected clients (to be used for durable handles). Pair-Programmed-With: Stefan Metzmacher me...@samba.org commit 3cdf441da1ff0c969c89285cfd9fd0f968f1a4e9 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 17 12:50:09 2012 +0200 lib/util: let server_id_str() skip the task_id if 0 in the cluster case too server_id_from_string() already handles that case. metze commit 6457fb5c39fd49fab2a804241de22e0e081093f4 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 17 12:49:26 2012 +0200 s3:lib: implement interpret_pid() as wrapper of server_id_from_string() metze commit d4a0aeb49a3e7536b34d101cf7b70b48cfa5f4ba Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 17 12:47:57 2012 +0200 lib/util: add server_id_from_string() metze commit 6a58c5fc648088c7c8930a0e653c2f1b01a90b13 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 17 12:45:33 2012 +0200 s3:lib: implement serverid_equal() as macro of server_id_equal() metze commit 8149623ad4e07f03b92832972c6d36ada92cc810 Author: Stefan Metzmacher me...@samba.org Date: Fri Aug 17 12:41:02 2012 +0200 lib/util: add server_id_equal() metze --- Summary of changes: lib/util/samba_util.h | 15 + lib/util/server_id.c | 99 +++- selftest/knownfail |8 +- source3/include/proto.h|2 +- source3/include/serverid.h |2 - source3/lib/serverid.c | 21 -- source3/lib/system.c |7 +- source3/lib/util.c | 31 +-- source4/torture/basic/delete.c | 622 9 files changed, 750 insertions(+), 57 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index 274dde8..4a6dd3b 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -899,6 +899,21 @@ char *data_path(TALLOC_CTX *mem_ctx, const char *name); const char *shlib_ext(void); struct server_id; +bool server_id_equal(const struct server_id *p1, const struct server_id *p2); char *server_id_str(TALLOC_CTX *mem_ctx, const struct server_id *id); +struct server_id server_id_from_string(uint32_t local_vnn, + const char *pid_string); + +/** + * Set the serverid to the special value that represents a disconnected + * client for (e.g.) durable handles. + */ +void server_id_set_disconnected(struct server_id *id); + +/** + * check whether a serverid is the special placeholder for + * a disconnected client + */ +bool server_id_is_disconnected(const struct server_id *id); #endif /* _SAMBA_UTIL_H_ */ diff --git a/lib/util/server_id.c b/lib/util/server_id.c index 195deea..a06891d 100644 --- a/lib/util/server_id.c +++ b/lib/util/server_id.c @@ -20,9 +20,32 @@
