diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-14 13:59:09 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-01-20 14:16:49 +0100 |
| commit | 3f8c7dc3560ec4356ff3c7dffe92394d8ddf62cd (patch) | |
| tree | 8b4412025659e56ce5cd13913e0933b8b2c4b2c1 /source/modules | |
| parent | 3a964d47446e08208435757829131efa9a4ccac3 (diff) | |
| download | samba-3f8c7dc3560ec4356ff3c7dffe92394d8ddf62cd.tar.gz samba-3f8c7dc3560ec4356ff3c7dffe92394d8ddf62cd.tar.xz samba-3f8c7dc3560ec4356ff3c7dffe92394d8ddf62cd.zip | |
s3:vfs_fileid: readd "fileid:algorithm" as option.
"fileid:mapping" is still supported as fallback.
metze
(cherry picked from commit 554a89df0cf6d9832778e2913f9fe50b78baeedc)
(cherry picked from commit fe9ad21b8cb5286845350fe2280da2cbe2647bb7)
Diffstat (limited to 'source/modules')
| -rw-r--r-- | source/modules/vfs_fileid.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/modules/vfs_fileid.c b/source/modules/vfs_fileid.c index 8ab4ac37932..787a49f36b6 100644 --- a/source/modules/vfs_fileid.c +++ b/source/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) { |