diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-14 13:59:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-16 15:16:58 +0100 |
| commit | 554a89df0cf6d9832778e2913f9fe50b78baeedc (patch) | |
| tree | cae6e672cde3f2382824eb6302065fe9e87055d9 | |
| parent | 673ca5145c9c120cdb522096fd625662407f6f3d (diff) | |
| download | samba-554a89df0cf6d9832778e2913f9fe50b78baeedc.tar.gz samba-554a89df0cf6d9832778e2913f9fe50b78baeedc.tar.bz2 samba-554a89df0cf6d9832778e2913f9fe50b78baeedc.zip | |
s3:vfs_fileid: readd "fileid:algorithm" as option.
"fileid:mapping" is still supported as fallback.
metze
| -rw-r--r-- | source3/modules/vfs_fileid.c | 8 |
1 files changed, 7 insertions, 1 deletions
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) { |