[SCM] Samba Shared Repository - branch master updated

2016-02-25 Thread Amitay Isaacs
The branch, master has been updated
   via  00f7d18 ctdb: Drop unnecessary defines of TEVENT_DEPRECATED
  from  a06bbf3 vfs_gpfs: Fix compile after change in get_nt_acl_fn

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 00f7d1830436f942b2f748f44fc38d35f2d1c8ee
Author: Martin Schwenke 
Date:   Wed Feb 24 16:05:34 2016 +1100

ctdb: Drop unnecessary defines of TEVENT_DEPRECATED

These have been scattered around the code so that
tevent_loop_allow_nesting() can be called.  However, only the main
daemon and some tests currently use nested event loops.
TEVENT_DEPRECATED is already defined in the places where it is needed.

Signed-off-by: Martin Schwenke 
Reviewed-by: Amitay Isaacs 

Autobuild-User(master): Amitay Isaacs 
Autobuild-Date(master): Fri Feb 26 07:11:29 CET 2016 on sn-devel-144

---

Summary of changes:
 ctdb/client/ctdb_client.c | 2 --
 ctdb/tools/ctdb.c | 2 --
 ctdb/wscript  | 3 ---
 3 files changed, 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 9f07472..fd70806 100644
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -24,8 +24,6 @@
 #include "system/locale.h"
 
 #include 
-/* Allow use of deprecated function tevent_loop_allow_nesting() */
-#define TEVENT_DEPRECATED
 #include 
 #include 
 
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 9061642..482f5fd 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -26,8 +26,6 @@
 
 #include 
 #include 
-/* Allow use of deprecated function tevent_loop_allow_nesting() */
-#define TEVENT_DEPRECATED
 #include 
 #include 
 
diff --git a/ctdb/wscript b/ctdb/wscript
index 43cbbc9..6dc855f 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -78,9 +78,6 @@ def set_options(opt):
 
 def configure(conf):
 
-# CTDB relies on nested event loops
-conf.env.TEVENT_DEPRECATED = 1
-
 # No need to build python bindings for talloc/tevent/tdb
 if conf.IN_LAUNCH_DIR():
 conf.env.standalone_ctdb = True


-- 
Samba Shared Repository



autobuild[sn-devel-104]: intermittent test failure detected

2016-02-25 Thread autobuild
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-26-0218/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-26-0218/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-26-0218/samba.stdout
  
The top commit at the time of the failure was:

commit cd1335e67dbfce0b6894ff209aa805d0314578da
Author: Jeremy Allison 
Date:   Wed Feb 24 14:02:45 2016 -0800

VFS: Modify rmdir to take a const struct smb_filename * instead of const 
char *

Preparing to reduce use of lp_posix_pathnames().

Uses the same techniques as commit 616d068f0cebb8e50a855b6e30f36fccb7f5a3c8
(synthetic_smb_fname()) to cope with modules that
modify the incoming pathname.

Signed-off-by: Jeremy Allison 
Reviewed-by: Michael Adam 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Thu Feb 25 20:46:49 CET 2016 on sn-devel-144



[SCM] Samba Shared Repository - branch master updated

2016-02-25 Thread Jeremy Allison
The branch, master has been updated
   via  a06bbf3 vfs_gpfs: Fix compile after change in get_nt_acl_fn
   via  1f9d1f9 s3/lib/netapi/tests/netuser.c: fix wrong closing paren
   via  cde44d4 s3/vfs_btrfs.c: use sizeof() instead of ARRAY_SIZE()
   via  c11ad90 smbd: ignore SVHDX create context
  from  cd1335e VFS: Modify rmdir to take a const struct smb_filename * 
instead of const char *

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit a06bbf344707604b612d63195050c5cc8fa19554
Author: Christof Schmitt 
Date:   Thu Feb 25 13:42:21 2016 -0700

vfs_gpfs: Fix compile after change in get_nt_acl_fn

Signed-off-by: Christof Schmitt 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Fri Feb 26 01:21:21 CET 2016 on sn-devel-144

commit 1f9d1f9cd70b4e9b41e53d9cca5025ed31ef7e71
Author: Aurelien Aptel 
Date:   Thu Feb 25 14:17:46 2016 +0100

s3/lib/netapi/tests/netuser.c: fix wrong closing paren

Signed-off-by: Aurelien Aptel 
Reviewed-by: David Disseldorp 
Reviewed-by: Michael Adam 
Revewied-by: Jeremy Allison 

commit cde44d48003499547c6745866b39c3e65bd25d38
Author: Aurelien Aptel 
Date:   Thu Feb 25 15:55:07 2016 +0100

s3/vfs_btrfs.c: use sizeof() instead of ARRAY_SIZE()

The `unused` member being set to zero is an uint64_t array. We want the
byte size here.

Signed-off-by: Aurelien Aptel 
Reviewed-by: David Disseldorp 
Reviewed-by: Jeremy Allison 

commit c11ad90a240a7703e04d290f78c15839ba31d733
Author: Uri Simchoni 
Date:   Thu Feb 25 07:08:06 2016 +0200

smbd: ignore SVHDX create context

According to discussions with doch...@microsoft.com, an SMB
server should ignore an SVHDX_OPEN_DEVICE_CONTEXT or
SVHDX_OPEN_DEVICE_CONTEXT_V2 create context if it does not
support the RSVD protocol. This is contrary to [MS-SMB2] rev 48.0
which states (3.3.5.9.14) that the open should fail in this case.

Failing the create fails Windows backup if the SMB dialect is
SMB3.0.2 or higher.

Hopefully a new revision of MS-SMB2 will clear this up in the future.

Meanwhile, this patch modifies smbd to ignore the
SVHDX_OPEN_DEVICE_CONTEXT by default. This can be overriden by a VFS
module if a VFS module adds support for RSVD.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11753

Signed-off-by: Uri Simchoni 
Reviewed-by: Jeremy Allison 
Reviewed-by: Richard Sharpe 

---

Summary of changes:
 source3/lib/netapi/tests/netuser.c |  2 +-
 source3/modules/vfs_btrfs.c|  2 +-
 source3/modules/vfs_default.c  | 16 
 source3/modules/vfs_gpfs.c | 21 -
 4 files changed, 14 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/tests/netuser.c 
b/source3/lib/netapi/tests/netuser.c
index beeeb34..de5f0a1 100644
--- a/source3/lib/netapi/tests/netuser.c
+++ b/source3/lib/netapi/tests/netuser.c
@@ -244,7 +244,7 @@ static NET_API_STATUS test_netusermodals(struct 
libnetapi_ctx *ctx,
return status;
}
 
-   if (memcmp(u0, _u0, sizeof(u0) != 0)) {
+   if (memcmp(u0, _u0, sizeof(*u0)) != 0) {
printf("USER_MODALS_INFO_0 struct has changed\n");
return -1;
}
diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c
index bd95637..154fcc3 100644
--- a/source3/modules/vfs_btrfs.c
+++ b/source3/modules/vfs_btrfs.c
@@ -531,7 +531,7 @@ static NTSTATUS btrfs_snap_create(struct vfs_handle_struct 
*handle,
ioctl_arg.fd = src_fd;
ioctl_arg.transid = 0;
ioctl_arg.flags = (rw == false) ? BTRFS_SUBVOL_RDONLY : 0;
-   memset(ioctl_arg.unused, 0, ARRAY_SIZE(ioctl_arg.unused));
+   memset(ioctl_arg.unused, 0, sizeof(ioctl_arg.unused));
len = strlcpy(ioctl_arg.name, dest_subvolume,
  ARRAY_SIZE(ioctl_arg.name));
if (len >= ARRAY_SIZE(ioctl_arg.name)) {
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index c3ff1bc..b13b517 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -571,22 +571,6 @@ static NTSTATUS vfswrap_create_file(vfs_handle_struct 
*handle,
const struct smb2_create_blobs 
*in_context_blobs,
struct smb2_create_blobs *out_context_blobs)
 {
-   struct smb2_create_blob *svhdx = NULL;
-
-   /*
-* It 

autobuild[sn-devel-144]: intermittent test failure detected

2016-02-25 Thread autobuild
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-26-0044/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-26-0044/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-26-0044/samba.stdout
  
The top commit at the time of the failure was:

commit cd1335e67dbfce0b6894ff209aa805d0314578da
Author: Jeremy Allison 
Date:   Wed Feb 24 14:02:45 2016 -0800

VFS: Modify rmdir to take a const struct smb_filename * instead of const 
char *

Preparing to reduce use of lp_posix_pathnames().

Uses the same techniques as commit 616d068f0cebb8e50a855b6e30f36fccb7f5a3c8
(synthetic_smb_fname()) to cope with modules that
modify the incoming pathname.

Signed-off-by: Jeremy Allison 
Reviewed-by: Michael Adam 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Thu Feb 25 20:46:49 CET 2016 on sn-devel-144



[SCM] Samba Shared Repository - branch master updated

2016-02-25 Thread Michael Adam
The branch, master has been updated
   via  cd1335e VFS: Modify rmdir to take a const struct smb_filename * 
instead of const char *
   via  de2bc1b vfs:ceph: Fix mkdir_fn to take struct smb_filename * insted 
of char *
   via  72333a6 vfs:glusterfs: Fix mkdir_fn to take struct smb_filename * 
instead of  char *
  from  0c61dd1 lib/util: Expose strv_addn() for adding string with 
specified length

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit cd1335e67dbfce0b6894ff209aa805d0314578da
Author: Jeremy Allison 
Date:   Wed Feb 24 14:02:45 2016 -0800

VFS: Modify rmdir to take a const struct smb_filename * instead of const 
char *

Preparing to reduce use of lp_posix_pathnames().

Uses the same techniques as commit 616d068f0cebb8e50a855b6e30f36fccb7f5a3c8
(synthetic_smb_fname()) to cope with modules that
modify the incoming pathname.

Signed-off-by: Jeremy Allison 
Reviewed-by: Michael Adam 

Autobuild-User(master): Michael Adam 
Autobuild-Date(master): Thu Feb 25 20:46:49 CET 2016 on sn-devel-144

commit de2bc1bc3890bcdd1b3b97ecc3d7e96f58ff50d3
Author: Jeremy Allison 
Date:   Wed Feb 24 14:00:27 2016 -0800

vfs:ceph: Fix mkdir_fn to take struct smb_filename * insted of char *

Missed in previous VFS change.

Signed-off-by: Jeremy Allison 

commit 72333a685526f6ac5699f076c8dd0e0ecddd3a33
Author: Jeremy Allison 
Date:   Wed Feb 24 13:58:16 2016 -0800

vfs:glusterfs: Fix mkdir_fn to take struct smb_filename * instead of  char *

Missed in previous VFS change.

Signed-off-by: Jeremy Allison 
Reviewed-by: Michael Adam 

---

Summary of changes:
 examples/VFS/skel_opaque.c  |  3 ++-
 examples/VFS/skel_transparent.c |  5 +++--
 source3/include/vfs.h   |  8 +--
 source3/include/vfs_macros.h|  8 +++
 source3/modules/vfs_acl_common.c| 10 -
 source3/modules/vfs_acl_tdb.c   |  7 +++---
 source3/modules/vfs_audit.c |  7 +++---
 source3/modules/vfs_cap.c   | 19 +---
 source3/modules/vfs_catia.c | 21 ++
 source3/modules/vfs_ceph.c  | 12 +++
 source3/modules/vfs_default.c   |  5 +++--
 source3/modules/vfs_extd_audit.c|  9 
 source3/modules/vfs_fruit.c |  6 --
 source3/modules/vfs_full_audit.c|  7 +++---
 source3/modules/vfs_glusterfs.c | 10 +
 source3/modules/vfs_media_harmony.c | 25 ++---
 source3/modules/vfs_netatalk.c  |  6 --
 source3/modules/vfs_posix_eadb.c|  6 --
 source3/modules/vfs_shadow_copy2.c  | 24 -
 source3/modules/vfs_snapper.c   | 19 
 source3/modules/vfs_streams_depot.c | 43 +++--
 source3/modules/vfs_syncops.c   |  5 +++--
 source3/modules/vfs_time_audit.c|  8 ---
 source3/modules/vfs_unityed_media.c | 24 ++---
 source3/modules/vfs_xattr_tdb.c |  6 --
 source3/smbd/close.c|  9 
 source3/smbd/vfs.c  |  5 +++--
 source3/torture/cmd_vfs.c   | 20 ++---
 28 files changed, 222 insertions(+), 115 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 9a855bc..8961627 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -165,7 +165,8 @@ static int skel_mkdir(vfs_handle_struct *handle,
return -1;
 }
 
-static int skel_rmdir(vfs_handle_struct *handle, const char *path)
+static int skel_rmdir(vfs_handle_struct *handle,
+   const struct smb_filename *smb_fname)
 {
errno = ENOSYS;
return -1;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index ac8cbc8..ac82432 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -164,9 +164,10 @@ static int skel_mkdir(vfs_handle_struct *handle,
return SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
 }
 
-static int skel_rmdir(vfs_handle_struct *handle, const char *path)
+static int skel_rmdir(vfs_handle_struct *handle,
+   const struct smb_filename *smb_fname)
 {
-   return SMB_VFS_NEXT_RMDIR(handle, path);
+   return SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 }
 
 static int skel_closedir(vfs_handle_struct *handle, DIR *dir)
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 48bacb0..b291206 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -175,6 +175,8 @@
const struct smb_filename * */
 /* Version 35 - Change mkdir from const char *, to

autobuild[sn-devel-104]: intermittent test failure detected

2016-02-25 Thread autobuild
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-25-1813/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-25-1813/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2016-02-25-1813/samba.stdout
  
The top commit at the time of the failure was:

commit 0c61dd15137b4603bd47b3d6ae18ded6bd18ffae
Author: Martin Schwenke 
Date:   Thu Feb 25 15:35:44 2016 +1100

lib/util: Expose strv_addn() for adding string with specified length

This is just a rename of previously static function _strv_append().

strv is now more useful for parsing.

Signed-off-by: Martin Schwenke 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Feb 25 13:43:31 CET 2016 on sn-devel-144



autobuild[sn-devel-144]: intermittent test failure detected

2016-02-25 Thread autobuild
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-25-1412/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-25-1412/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2016-02-25-1412/samba.stdout
  
The top commit at the time of the failure was:

commit eb5cdce2470f5e77df534902d8f1dc7baf8195d4
Author: Andrew Bartlett 
Date:   Wed Feb 24 16:39:38 2016 +1300

samba-tool: Support preloading multiple users

Based on patches by Adrian Cochrane

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Feb 25 07:58:55 CET 2016 on sn-devel-144



[SCM] Samba Shared Repository - branch master updated

2016-02-25 Thread Volker Lendecke
The branch, master has been updated
   via  0c61dd1 lib/util: Expose strv_addn() for adding string with 
specified length
  from  eb5cdce samba-tool: Support preloading multiple users

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 0c61dd15137b4603bd47b3d6ae18ded6bd18ffae
Author: Martin Schwenke 
Date:   Thu Feb 25 15:35:44 2016 +1100

lib/util: Expose strv_addn() for adding string with specified length

This is just a rename of previously static function _strv_append().

strv is now more useful for parsing.

Signed-off-by: Martin Schwenke 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Thu Feb 25 13:43:31 CET 2016 on sn-devel-144

---

Summary of changes:
 lib/util/strv.c | 7 +++
 lib/util/strv.h | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/strv.c b/lib/util/strv.c
index f5879c7..fab3e56 100644
--- a/lib/util/strv.c
+++ b/lib/util/strv.c
@@ -22,8 +22,7 @@
 #include "talloc.h"
 #include 
 
-static int _strv_append(TALLOC_CTX *mem_ctx, char **dst, const char *src,
-   size_t srclen)
+int strv_addn(TALLOC_CTX *mem_ctx, char **dst, const char *src, size_t srclen)
 {
size_t dstlen = talloc_array_length(*dst);
size_t newlen = dstlen + srclen;
@@ -45,12 +44,12 @@ static int _strv_append(TALLOC_CTX *mem_ctx, char **dst, 
const char *src,
 
 int strv_add(TALLOC_CTX *mem_ctx, char **strv, const char *string)
 {
-   return _strv_append(mem_ctx, strv, string, strlen(string)+1);
+   return strv_addn(mem_ctx, strv, string, strlen(string)+1);
 }
 
 int strv_append(TALLOC_CTX *mem_ctx, char **strv, const char *src)
 {
-   return _strv_append(mem_ctx, strv, src, talloc_array_length(src));
+   return strv_addn(mem_ctx, strv, src, talloc_array_length(src));
 }
 
 static bool strv_valid_entry(const char *strv, const char *entry,
diff --git a/lib/util/strv.h b/lib/util/strv.h
index 843ce5c..fb1a806 100644
--- a/lib/util/strv.h
+++ b/lib/util/strv.h
@@ -23,6 +23,7 @@
 #include "talloc.h"
 
 int strv_add(TALLOC_CTX *mem_ctx, char **strv, const char *string);
+int strv_addn(TALLOC_CTX *mem_ctx, char **dst, const char *src, size_t srclen);
 int strv_append(TALLOC_CTX *mem_ctx, char **strv, const char *src);
 char *strv_next(char *strv, const char *entry);
 char *strv_find(char *strv, const char *entry);


-- 
Samba Shared Repository