[SCM] Samba Shared Repository - branch v3-5-test updated
Jeremy Allison
jra at samba.org
Mon Nov 23 19:08:43 MST 2009
The branch, v3-5-test has been updated
via d87c261... Remove unused code. Jeremy. (cherry picked from commit 4b8859840be2aacc90a2779820e08a09c793df3b)
from 45bbbb0... Proper fix for #6898 - Samba duplicates file content on appending. Pointed out by Volker.Restores the pathname handling for FILE_FLAG_POSIX_SEMANTICS but still prevents the O_APPEND problems. Jeremy. (cherry picked from commit f8bd0559ada056722d7d5ae0286753e7c591650b)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit d87c26171b757c3a0471edac4fb982c3f8d0dc35
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 23 18:00:36 2009 -0800
Remove unused code.
Jeremy.
(cherry picked from commit 4b8859840be2aacc90a2779820e08a09c793df3b)
-----------------------------------------------------------------------
Summary of changes:
source3/include/proto.h | 3 ---
source3/smbd/open.c | 46 ----------------------------------------------
2 files changed, 0 insertions(+), 49 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 341a4ab..1c10578 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6627,9 +6627,6 @@ void msg_file_was_renamed(struct messaging_context *msg,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
-struct case_semantics_state;
-struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX *mem_ctx,
- connection_struct *conn);
NTSTATUS open_streams_for_delete(connection_struct *conn,
const char *fname);
NTSTATUS create_file_default(connection_struct *conn,
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 911e8fd..420b41c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2770,52 +2770,6 @@ void msg_file_was_renamed(struct messaging_context *msg,
return;
}
-struct case_semantics_state {
- connection_struct *conn;
- bool case_sensitive;
- bool case_preserve;
- bool short_case_preserve;
-};
-
-/****************************************************************************
- Restore case semantics.
-****************************************************************************/
-static int restore_case_semantics(struct case_semantics_state *state)
-{
- state->conn->case_sensitive = state->case_sensitive;
- state->conn->case_preserve = state->case_preserve;
- state->conn->short_case_preserve = state->short_case_preserve;
- return 0;
-}
-
-/****************************************************************************
- Save case semantics.
-****************************************************************************/
-struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX *mem_ctx,
- connection_struct *conn)
-{
- struct case_semantics_state *result;
-
- if (!(result = talloc(mem_ctx, struct case_semantics_state))) {
- DEBUG(0, ("talloc failed\n"));
- return NULL;
- }
-
- result->conn = conn;
- result->case_sensitive = conn->case_sensitive;
- result->case_preserve = conn->case_preserve;
- result->short_case_preserve = conn->short_case_preserve;
-
- /* Set to POSIX. */
- conn->case_sensitive = True;
- conn->case_preserve = True;
- conn->short_case_preserve = True;
-
- talloc_set_destructor(result, restore_case_semantics);
-
- return result;
-}
-
/*
* If a main file is opened for delete, all streams need to be checked for
* !FILE_SHARE_DELETE. Do this by opening with DELETE_ACCESS.
--
Samba Shared Repository
More information about the samba-cvs
mailing list