[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f52158d torture: add FSRVP share snapshot ACL test
via b8b4d88 torture: add FSRVP message sequence timeout test
via 3d65bfe torture: add timeout sleeps to fsrvp create helper
via c9cac85 torture: validate FSCTL_SRV_ENUMERATE_SNAPSHOTS response
via 159d1dd nss_wrapper: Fix some discarding const warnings
via 9a936f9 nss_wrapper: Align indentation with the rest of Samba
from cef718c autobuild: fix ctdb build of samba-ctdb target after switch
to waf.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f52158d74039afd0af6fcf185349bf80e8c36511
Author: David Disseldorp dd...@samba.org
Date: Fri Jun 20 19:14:15 2014 +0200
torture: add FSRVP share snapshot ACL test
The new test_fsrvp_share_sd test sets a unique ACL on the base share,
and then confirms that snapshot shares carry the same ACL.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Sat Jun 21 15:10:12 CEST 2014 on sn-devel-104
commit b8b4d88846cef595740ec8ad1d7586e539ed5258
Author: David Disseldorp dd...@samba.org
Date: Fri Jun 20 19:14:14 2014 +0200
torture: add FSRVP message sequence timeout test
Sleep at various points in the FSRVP snapshot creation state machine,
and confirm that the state timeout is reflected in subsequent server
responses.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit 3d65bfe0fa41878a98ae14bdbf0074bb01371ad9
Author: David Disseldorp dd...@samba.org
Date: Fri Jun 20 19:14:13 2014 +0200
torture: add timeout sleeps to fsrvp create helper
Attempt to trip message sequence timeouts at various points in the FSRVP
shadow-copy creation state machine.
The default timeout-injection sleep durations correspond to those
documented in MS-FSRVP (+500ms). They can also be manually set using the
fss: sequence timeout parameter.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit c9cac858d2c844f081510b147d7a79de6a6ec78e
Author: David Disseldorp dd...@samba.org
Date: Fri Jun 20 19:14:12 2014 +0200
torture: validate FSCTL_SRV_ENUMERATE_SNAPSHOTS response
Check the NumberOfSnapShotsReturned and SnapShotArraySize fields in the
FSCTL_SRV_ENUMERATE_SNAPSHOTS response match expected values.
This is a regression test for bso#10549.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit 159d1dde3a797360a47afa217c360a518034eb4e
Author: Volker Lendecke v...@samba.org
Date: Sat Jun 21 10:48:56 2014 +0200
nss_wrapper: Fix some discarding const warnings
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit 9a936f96983d39868c9e337bcdfae945ffcc3f72
Author: Volker Lendecke v...@samba.org
Date: Sat Jun 21 10:47:28 2014 +0200
nss_wrapper: Align indentation with the rest of Samba
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
---
Summary of changes:
lib/nss_wrapper/nss_wrapper.c | 32 ++--
source4/torture/rpc/fsrvp.c | 329 -
2 files changed, 337 insertions(+), 24 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index 7c5a413..a012cbd 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -4046,24 +4046,24 @@ static int nwrap_getnameinfo(const struct sockaddr *sa,
socklen_t salen,
type = sa-sa_family;
switch (type) {
- case AF_INET:
- if (salen sizeof(struct sockaddr_in))
- return EAI_FAMILY;
- addr = ((struct sockaddr_in *)sa)-sin_addr;
- addrlen = sizeof(((struct sockaddr_in *)sa)-sin_addr);
- port = ntohs(((struct sockaddr_in *)sa)-sin_port);
- break;
+ case AF_INET:
+ if (salen sizeof(struct sockaddr_in))
+ return EAI_FAMILY;
+ addr = ((const struct sockaddr_in *)sa)-sin_addr;
+ addrlen = sizeof(((const struct sockaddr_in *)sa)-sin_addr);
+ port = ntohs(((const struct sockaddr_in *)sa)-sin_port);
+ break;
#ifdef HAVE_IPV6
- case AF_INET6:
- if (salen sizeof(struct sockaddr_in6))
- return EAI_FAMILY;
- addr = ((struct sockaddr_in6 *)sa)-sin6_addr;
-
[SCM] NSS Wrapper Repository - branch master updated
The branch, master has been updated
via 6ab6a09 nss_wrapper: Fix some discarding const warnings
via dbaad3a nss_wrapper: Align indentation with the rest of Samba
from 7d26793 nwrap: Fall back to RTLD_NEXT if we can't find libc.
http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master
- Log -
commit 6ab6a09feb599fbca4fd2886adfb9d1ec4f10ed7
Author: Volker Lendecke v...@samba.org
Date: Sat Jun 21 10:48:56 2014 +0200
nss_wrapper: Fix some discarding const warnings
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
commit dbaad3a1710bf1bf642c9dca46300e950d0c93e2
Author: Volker Lendecke v...@samba.org
Date: Sat Jun 21 10:47:28 2014 +0200
nss_wrapper: Align indentation with the rest of Samba
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
---
Summary of changes:
src/nss_wrapper.c | 32
1 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index 6ed48c6..e3943ee 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -4049,24 +4049,24 @@ static int nwrap_getnameinfo(const struct sockaddr *sa,
socklen_t salen,
type = sa-sa_family;
switch (type) {
- case AF_INET:
- if (salen sizeof(struct sockaddr_in))
- return EAI_FAMILY;
- addr = ((struct sockaddr_in *)sa)-sin_addr;
- addrlen = sizeof(((struct sockaddr_in *)sa)-sin_addr);
- port = ntohs(((struct sockaddr_in *)sa)-sin_port);
- break;
+ case AF_INET:
+ if (salen sizeof(struct sockaddr_in))
+ return EAI_FAMILY;
+ addr = ((const struct sockaddr_in *)sa)-sin_addr;
+ addrlen = sizeof(((const struct sockaddr_in *)sa)-sin_addr);
+ port = ntohs(((const struct sockaddr_in *)sa)-sin_port);
+ break;
#ifdef HAVE_IPV6
- case AF_INET6:
- if (salen sizeof(struct sockaddr_in6))
- return EAI_FAMILY;
- addr = ((struct sockaddr_in6 *)sa)-sin6_addr;
- addrlen = sizeof(((struct sockaddr_in6
*)sa)-sin6_addr);
- port = ntohs(((struct sockaddr_in6 *)sa)-sin6_port);
- break;
-#endif
- default:
+ case AF_INET6:
+ if (salen sizeof(struct sockaddr_in6))
return EAI_FAMILY;
+ addr = ((const struct sockaddr_in6 *)sa)-sin6_addr;
+ addrlen = sizeof(((const struct sockaddr_in6 *)sa)-sin6_addr);
+ port = ntohs(((const struct sockaddr_in6 *)sa)-sin6_port);
+ break;
+#endif
+ default:
+ return EAI_FAMILY;
}
if (host != NULL) {
--
NSS Wrapper Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via cad1d0b torture3: Reproducer for bug 10593 via 713518a smbd: Fix bug 10593 via 0c2e763 smbd: First watch, then defer via 0ead434 smbd: Store struct deferred_open_record instead of anonymous data on pml via 01c197d libsmb: Make cli_ntcreate cancellable via bb6b31d libsmb: Make cli_ntcreate1 cancellable via c597c93 libsmb: Make cli_smb2_create_fnum cancellable via 0a2209c libsmb: Make smb2cli_create cancellable via 5aeebc3 libsmb: Enable oplocks for smb2 cli_ntcreate via 7882762 libsmb: Align cli_ntcreate with other sync wrappers via 700b439 libsmb: remove smb2 switch from cli_ntcreate via 37f8cb1 libsmb: Replace async cli_ntcreate by cli_create via 891e63b libsmb: Add cli_create_send/recv via f0876ff libsmb: Make cli_smb2_create_fnum async from f52158d torture: add FSRVP share snapshot ACL test http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cad1d0b048d641cb4ae53424b89ca07ab8f4216e Author: Volker Lendecke v...@samba.org Date: Thu Jun 19 14:37:40 2014 + torture3: Reproducer for bug 10593 We panic if we get an oplock break response for a cancelled create request Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Sat Jun 21 23:05:47 CEST 2014 on sn-devel-104 commit 713518a4c85172973611cf99b77ba4fe631fb850 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 14:15:54 2014 + smbd: Fix bug 10593 Bug 10593 is a panic that happens if we get an oplock break reply via dbwrap_watch for which we can't find the SMB request anymore. This error condition can legally happen when a client cancels the create request before the oplock break response comes in. This patch drops the dbwrap_watch_send request waiting for the oplock break when the request is cancelled. Yet another talloc hierarchy problem, but if done right, talloc hierarchies can make rundown of state easy :-) Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 0c2e763aaa05f63bb8563e62f9731e35afa9ed86 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 14:15:19 2014 + smbd: First watch, then defer We exit if any of these if-statement fails, so a simple swap should not make a difference. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 0ead434b84a7c3226ac223acc79ad0e794da3877 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 14:12:14 2014 + smbd: Store struct deferred_open_record instead of anonymous data on pml The main point is to get a talloc parent that will go away when the request is cancelled Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 01c197dc159297d9abdc62f0d2f69d4724b9fc5c Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 10:38:36 2014 + libsmb: Make cli_ntcreate cancellable Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit bb6b31dd866b0a06e2026f072db8c61a8a986ab6 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 10:38:10 2014 + libsmb: Make cli_ntcreate1 cancellable Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit c597c9344ca7630335d8fad1ddb4466b01eb9aff Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 10:37:46 2014 + libsmb: Make cli_smb2_create_fnum cancellable Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 0a2209c1611f318b546ff08348c6579991579cb9 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 10:37:14 2014 + libsmb: Make smb2cli_create cancellable Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 5aeebc3eb04245a059a3cffde649b0437aa1e332 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 09:55:04 2014 + libsmb: Enable oplocks for smb2 cli_ntcreate Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 78827623eb9ebf96df13dfbe8e1a0ec3aa6d16a3 Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 08:53:49 2014 + libsmb: Align cli_ntcreate with other sync wrappers ... saves 5 lines :-) Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Jeremy Allison j...@samba.org commit 700b43940a6984fb4e4e4b7ad96804501cf71bca Author: Volker Lendecke v...@samba.org Date: Fri Jun 20 08:52:45 2014 + libsmb: remove smb2 switch from cli_ntcreate
