The branch, master has been updated
via 2723d900ef3 vfs_fileid: fix fsname_norootdir algorithm
from 9e4b08f4c38 join: Throw CommandError instead of Exception for
simple errors
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2723d900ef35f4797058675f298f4a4364b29cd3
Author: Ralph Wuerthner <[email protected]>
Date: Tue Jan 15 09:55:50 2019 +0100
vfs_fileid: fix fsname_norootdir algorithm
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13744
Signed-off-by: Ralph Wuerthner <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Jan 17 01:36:54 CET 2019 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_fileid.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index cb77a2e52c6..cd6f9c30cf3 100644
--- a/source3/modules/vfs_fileid.c
+++ b/source3/modules/vfs_fileid.c
@@ -456,7 +456,8 @@ static struct file_id fileid_file_id_create(struct
vfs_handle_struct *handle,
struct fileid_handle_data,
return id);
- if ((data->nolockinode != 0) && (id.inode == data->nolockinode)) {
+ if ((data->nolockinode != 0) &&
+ (sbuf->st_ex_ino == data->nolockinode)) {
devid = fileid_device_mapping_hostname(data, sbuf);
} else {
devid = data->device_mapping_fn(data, sbuf);
--
Samba Shared Repository
