From 554a89df0cf6d9832778e2913f9fe50b78baeedc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Jan 2009 13:59:09 +0100 Subject: s3:vfs_fileid: readd "fileid:algorithm" as option. "fileid:mapping" is still supported as fallback. metze --- source3/modules/vfs_fileid.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c index 8ab4ac3793..787a49f36b 100644 --- a/source3/modules/vfs_fileid.c +++ b/source3/modules/vfs_fileid.c @@ -188,10 +188,16 @@ static int fileid_connect(struct vfs_handle_struct *handle, return -1; } - data->device_mapping_fn = fileid_device_mapping_fsid; + /* + * "fileid:mapping" is only here as fallback for old setups + * "fileid:algorithm" is the option new setups should use + */ algorithm = lp_parm_const_string(SNUM(handle->conn), "fileid", "mapping", "fsname"); + algorithm = lp_parm_const_string(SNUM(handle->conn), + "fileid", "algorithm", + algorithm); if (strcmp("fsname", algorithm) == 0) { data->device_mapping_fn = fileid_device_mapping_fsname; } else if (strcmp("fsid", algorithm) == 0) { -- cgit