[SCM] Samba Shared Repository - branch master updated

[Uri Simchoni]

The branch, master has been updated
       via  6831ba3 s3:vfs:glusterfs: fix build after quota changes.
      from  81cf1fa s3:libads: we always have arcfour-hmac-md5 support

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


- Log -----------------------------------------------------------------
commit 6831ba35b92c15eef3d4fb09cf6eeedf5a7f92d0
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 1 16:06:18 2016 +0100

    s3:vfs:glusterfs: fix build after quota changes.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    
    Autobuild-User(master): Uri Simchoni <uri at samba.org>
    Autobuild-Date(master): Mon Feb  1 22:09:18 CET 2016 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_glusterfs.c | 1 +
 1 file changed, 1 insertion(+)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index f32f598..427b985 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -296,6 +296,7 @@ static uint64_t vfs_gluster_disk_free(struct vfs_handle_struct *handle,
 }
 
 static int vfs_gluster_get_quota(struct vfs_handle_struct *handle,
+				 const char *path,
 				 enum SMB_QUOTA_TYPE qtype, unid_t id,
 				 SMB_DISK_QUOTA *qt)
 {


-- 
Samba Shared Repository