The branch, master has been updated
via 1cf54ef s3: Use talloc_tos() in set_write_time()
via 27e63b7 s3: Use talloc_tos() in set_sticky_write_time()
via 3441c01 s3: Convert open_files.idl to tab indents
from 4eb5b0b s3:messaging.idl: obsolete unused MSG_SMB_SAM_*
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1cf54ef4a69e78dff5a812d447b0f385b56c5ebd
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 13 14:11:38 2011 +0100
s3: Use talloc_tos() in set_write_time()
Autobuild-User: Volker Lendecke <[email protected]>
Autobuild-Date: Tue Dec 13 15:44:58 CET 2011 on sn-devel-104
commit 27e63b72a1356aa0ca73c6bda23dcc4ecfcc4b0a
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 13 14:11:28 2011 +0100
s3: Use talloc_tos() in set_sticky_write_time()
commit 3441c01b16630300a4d7ea4f63fc7e785c91e7ab
Author: Volker Lendecke <[email protected]>
Date: Tue Dec 13 12:45:11 2011 +0100
s3: Convert open_files.idl to tab indents
-----------------------------------------------------------------------
Summary of changes:
source3/librpc/idl/open_files.idl | 68 ++++++++++++++++++------------------
source3/locking/locking.c | 4 +-
2 files changed, 36 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/idl/open_files.idl
b/source3/librpc/idl/open_files.idl
index c6f1627..9f06a0c 100644
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -5,44 +5,44 @@ import "security.idl";
import "file_id.idl";
[
- pointer_default(unique)
+ pointer_default(unique)
]
interface open_files
{
- typedef [public] struct {
- server_id pid;
- hyper op_mid;
- uint16 op_type;
- uint32 access_mask;
- uint32 share_access;
- uint32 private_options;
- timeval time;
- file_id id;
- udlong share_file_id;
- uint32 uid;
- uint16 flags;
- uint32 name_hash;
- } share_mode_entry;
+ typedef [public] struct {
+ server_id pid;
+ hyper op_mid;
+ uint16 op_type;
+ uint32 access_mask;
+ uint32 share_access;
+ uint32 private_options;
+ timeval time;
+ file_id id;
+ udlong share_file_id;
+ uint32 uid;
+ uint16 flags;
+ uint32 name_hash;
+ } share_mode_entry;
- typedef [public] struct {
- uint32 name_hash;
- security_unix_token *delete_token;
- } delete_token;
+ typedef [public] struct {
+ uint32 name_hash;
+ security_unix_token *delete_token;
+ } delete_token;
- typedef [public] struct {
- [string,charset(UTF8)] char *servicepath;
- [string,charset(UTF8)] char *base_name;
- [string,charset(UTF8)] char *stream_name;
- file_id id;
- uint32 num_share_modes;
- [size_is(num_share_modes)] share_mode_entry share_modes[];
- uint32 num_delete_tokens;
- [size_is(num_delete_tokens)] delete_token delete_tokens[];
- timespec old_write_time;
- timespec changed_write_time;
- uint8 fresh;
- uint8 modified;
- [ignore] db_record *record;
- } share_mode_lock;
+ typedef [public] struct {
+ [string,charset(UTF8)] char *servicepath;
+ [string,charset(UTF8)] char *base_name;
+ [string,charset(UTF8)] char *stream_name;
+ file_id id;
+ uint32 num_share_modes;
+ [size_is(num_share_modes)] share_mode_entry share_modes[];
+ uint32 num_delete_tokens;
+ [size_is(num_delete_tokens)] delete_token delete_tokens[];
+ timespec old_write_time;
+ timespec changed_write_time;
+ uint8 fresh;
+ uint8 modified;
+ [ignore] db_record *record;
+ } share_mode_lock;
}
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index caa2b5a..c1f9943 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1415,7 +1415,7 @@ bool set_sticky_write_time(struct file_id fileid, struct
timespec write_time)
convert_timespec_to_time_t(write_time)),
file_id_string_tos(&fileid)));
- lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
+ lck = get_share_mode_lock(talloc_tos(), fileid, NULL, NULL, NULL);
if (lck == NULL) {
return False;
}
@@ -1438,7 +1438,7 @@ bool set_write_time(struct file_id fileid, struct
timespec write_time)
convert_timespec_to_time_t(write_time)),
file_id_string_tos(&fileid)));
- lck = get_share_mode_lock(NULL, fileid, NULL, NULL, NULL);
+ lck = get_share_mode_lock(talloc_tos(), fileid, NULL, NULL, NULL);
if (lck == NULL) {
return False;
}
--
Samba Shared Repository
