s3:smbd: add vfs_fake_fd_close() helper

When we used vfs_fake_fd() we should use vfs_fake_fd_close()
in order to have things symetric.

This makes code easier to understand and may allow us to change
vfs_fake_fd() internally if required.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14596

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(back-ported from commit 8f057333466b2d9845cd8bc2b794d98252ade2a4)

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 7d59ca5242f7269652340431d6ce658d52c4d363..fea3abfee7ddf5428dada512d5c225c791c44cc3 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1333,6 +1333,8 @@ NTSTATUS vfs_streaminfo(connection_struct *conn,
                        unsigned int *num_streams,
                        struct stream_struct **streams);
 void init_smb_file_time(struct smb_file_time *ft);
+int vfs_fake_fd(void);
+int vfs_fake_fd_close(int fd);
 
 /* The following definitions come from smbd/avahi_register.c */
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index f8c71014955f7326cf0befc4a7a591eef43b035d..c4978fe521222aceb3809f02490ebba74ce7c9c1 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1582,6 +1582,15 @@ NTSTATUS vfs_streaminfo(connection_struct *conn,
                        streams);
 }
 
+/*
+ * This is just a helper to make
+ * users of vfs_fake_fd() more symetric
+ */
+int vfs_fake_fd_close(int fd)
+{
+       return close(fd);
+}
+
 /*
   generate a file_id from a stat structure
  */