diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-16 15:51:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-16 15:51:46 +0100 |
| commit | 0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7 (patch) | |
| tree | 9d144da5fa6999e1ec5675164fb386581071e807 /source3/modules/vfs_fileid.c | |
| parent | f69ac1398770e4c8c211e083bcf526f9a9d99e4a (diff) | |
| parent | dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12 (diff) | |
| download | samba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.tar.gz samba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.tar.bz2 samba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/modules/vfs_fileid.c')
| -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) { |