summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-10-03 10:46:22 +0200
committerVolker Lendecke <vl@samba.org>2010-10-03 10:51:08 +0200
commit97b76364e7c8103ee6dd6e41d85d3932e46eafdc (patch)
tree6b21e9034ccc11a57e3c15efda7906949bd5a445 /source3
parentc87d4e5ddbbafea6f0d2dd5062041d41e80db877 (diff)
downloadsamba-97b76364e7c8103ee6dd6e41d85d3932e46eafdc.tar.gz
samba-97b76364e7c8103ee6dd6e41d85d3932e46eafdc.tar.bz2
samba-97b76364e7c8103ee6dd6e41d85d3932e46eafdc.zip
s3: Attempt to fix a ton of warnings on the build farm
Diffstat (limited to 'source3')
-rw-r--r--source3/include/fake_file.h10
-rw-r--r--source3/include/proto.h12
-rw-r--r--source3/smbd/close.c1
3 files changed, 11 insertions, 12 deletions
diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 6b34005625..0581fbcea5 100644
--- 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 7fb0a3d088..71a7baf667 100644
--- 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 c25d7e1168..13ebe337e2 100644
--- 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.