s3: Attempt to fix a ton of warnings on the build farm

diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 6b3400562516b39c78bf99078620407861d4c6d2..0581fbcea5981171c0f1f7021f4e9a57850a9959 100644 (file)
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -38,4 +38,14 @@ struct fake_file_handle {
        void *private_data;
 };
 
+enum FAKE_FILE_TYPE is_fake_file_path(const char *path);
+enum FAKE_FILE_TYPE is_fake_file(const struct smb_filename *smb_fname);
+NTSTATUS open_fake_file(struct smb_request *req, connection_struct *conn,
+                               uint16_t current_vuid,
+                               enum FAKE_FILE_TYPE fake_file_type,
+                               const struct smb_filename *smb_fname,
+                               uint32 access_mask,
+                               files_struct **result);
+NTSTATUS close_fake_file(struct smb_request *req, files_struct *fsp);
+
 #endif /* _FAKE_FILE_H */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7fb0a3d0882a0fea5962a6124b45b471bbe26af6..71a7baf667387032c0c535c454ba7254c95bc713 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4649,18 +4649,6 @@ void reply_both_error(struct smb_request *req, uint8 eclass, uint32 ecode,
                      NTSTATUS status, int line, const char *file);
 void reply_openerror(struct smb_request *req, NTSTATUS status);
 
-/* The following definitions come from smbd/fake_file.c  */
-
-enum FAKE_FILE_TYPE is_fake_file_path(const char *path);
-enum FAKE_FILE_TYPE is_fake_file(const struct smb_filename *smb_fname);
-NTSTATUS open_fake_file(struct smb_request *req, connection_struct *conn,
-                               uint16_t current_vuid,
-                               enum FAKE_FILE_TYPE fake_file_type,
-                               const struct smb_filename *smb_fname,
-                               uint32 access_mask,
-                               files_struct **result);
-NTSTATUS close_fake_file(struct smb_request *req, files_struct *fsp);
-
 /* The following definitions come from smbd/file_access.c  */
 
 bool can_access_file_acl(struct connection_struct *conn,

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index c25d7e116830ef5d1274628391e40095fc2caa9c..13ebe337e214a14a57d7b2213b9ff4be51ecfe7e 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -23,6 +23,7 @@
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
+#include "fake_file.h"
 
 /****************************************************************************
  Run a file if it is a magic script.