[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  97b7636 s3: Attempt to fix a ton of warnings on the build farm
      from  c87d4e5 s3: Remove talloc_autofree_context() from dmapi.c

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 97b76364e7c8103ee6dd6e41d85d3932e46eafdc
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 3 10:46:22 2010 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source3/include/fake_file.h |   10 ++++++++++
 source3/include/proto.h     |   12 ------------
 source3/smbd/close.c        |    1 +
 3 files changed, 11 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 6b34005..0581fbc 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 7fb0a3d..71a7baf 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 c25d7e1..13ebe33 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.


-- 
Samba Shared Repository