From: Volker Lendecke <vl@samba.org>
Date: Wed, 7 Feb 2018 13:32:37 +0000 (+0100)
Subject: smbd: remove "id" from share_mode_entry
X-Git-Tag: tevent-0.9.36~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bbc57564411b031bf3ce55652c9c899642da045;p=thirdparty%2Fsamba.git

smbd: remove "id" from share_mode_entry

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Feb 13 05:01:38 CET 2018 on sn-devel-144
---

diff --git a/source3/librpc/idl/open_files.idl b/source3/librpc/idl/open_files.idl
index 1f85f245fca..8d652a9fa01 100644
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -51,7 +51,6 @@ interface open_files
 		uint32		share_access;
 		uint32		private_options;
 		timeval		time;
-		file_id		id;
 		udlong		share_file_id;
 		uint32		uid;
 		uint16		flags;
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 738b997f644..791878c6383 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -847,7 +847,6 @@ bool set_share_mode(struct share_mode_lock *lck, struct files_struct *fsp,
 	e->lease = lease;
 	e->time.tv_sec = fsp->open_time.tv_sec;
 	e->time.tv_usec = fsp->open_time.tv_usec;
-	e->id = fsp->file_id;
 	e->share_file_id = fsp->fh->gen_id;
 	e->uid = (uint32_t)uid;
 	e->flags = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?