[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  6ed3985 vfs_shadow_copy2: check crossmountpoints against snapdirseverywhere
      from  6cff009 smbcacls: fix uninitialized variable

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


- Log -----------------------------------------------------------------
commit 6ed39851827f86a6a062942bf6fd82d045f0a1d4
Author: Uri Simchoni <uri at samba.org>
Date:   Tue Nov 3 10:42:00 2015 +0200

    vfs_shadow_copy2: check crossmountpoints against snapdirseverywhere
    
    If crossmountpoints is enabled, verify that snapdirseverywhere is
    enabled too, since crossmountpoints has no meaning otherwise.
    
    This obviates the check of crossmountpoints against other config
    variables.
    
    Signed-off-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Jan 22 01:54:06 CET 2016 on sn-devel-144

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

Summary of changes:
 source3/modules/vfs_shadow_copy2.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 018ec88..cffca09 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1928,6 +1928,11 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle,
 						"shadow", "crossmountpoints",
 						false);
 
+	if (config->crossmountpoints && !config->snapdirseverywhere) {
+		DBG_WARNING("Warning: 'crossmountpoints' depends on "
+			    "'snapdirseverywhere'. Disabling crossmountpoints.\n");
+	}
+
 	config->fixinodes = lp_parm_bool(SNUM(handle->conn),
 					 "shadow", "fixinodes",
 					 false);
@@ -2018,12 +2023,6 @@ static int shadow_copy2_connect(struct vfs_handle_struct *handle,
 		TALLOC_FREE(config->basedir);
 	}
 
-	if (config->crossmountpoints && config->basedir != NULL) {
-		DEBUG(1, (__location__ " Warning: 'basedir' is incompatible "
-			  "with 'crossmountpoints'. Disabling basedir.\n"));
-		TALLOC_FREE(config->basedir);
-	}
-
 	if (config->basedir == NULL) {
 		config->basedir = config->mount_point;
 	}


-- 
Samba Shared Repository