[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.7-ctdb-9-14-g2125c5b
Michael Adam
obnox at samba.org
Mon Aug 30 01:32:58 MDT 2010
The branch, v3-4-ctdb has been updated
via 2125c5b1807037859fc619897d8cd39570939ced (commit)
via 489ce86b80db2aa0955bfd3235d1f382a2db42d4 (commit)
via f482cf315c58a9ba5a9e91d139c5906c866d55f2 (commit)
via 764cc6b2da11d94f9bd4dfea406c21304e757358 (commit)
via 2d88a06480645a3023f10990bb9b3a615b739605 (commit)
via ae678d7c87c7783014cf4b66c7b2aa4f6077f3fd (commit)
via 00f79937b191c5a9c5314ee2ab8245a50264dc94 (commit)
via 74ea870dd487b240270eb017c8ca9bae595f48a5 (commit)
via 193e3f27066d9c70f4dcb088afa1404964c3fa1b (commit)
via 8def70861966088cde0ae4b5135297831b083e65 (commit)
via 4fd361a1862c58723ad5fe06a163a9b50b2ac1b2 (commit)
via ed4805e43ad0a0da8e91a3c3b87048392e18ce65 (commit)
via 5c00bf89801bcb63b847d309360587047a76511e (commit)
via ed1b0c39d71a852b6885363ddced4248a06ff986 (commit)
from 05b3d5ba0c22ff94838c3c9304cb8c237e041920 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 2125c5b1807037859fc619897d8cd39570939ced
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 24 21:40:21 2010 +0200
v3-4-ctdb: fix typo in README
commit 489ce86b80db2aa0955bfd3235d1f382a2db42d4
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 28 16:22:26 2010 +0200
Attempt to fix the build on AIX, that system seems to have a #define for s_type
commit f482cf315c58a9ba5a9e91d139c5906c866d55f2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Mar 29 07:24:00 2010 +0200
s3: Attempt to fix the build on AIX, shm_ptr seems to be a macro there
commit 764cc6b2da11d94f9bd4dfea406c21304e757358
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 17 13:20:02 2010 +0200
v3-4-ctdb: Attempt to fix a segfault in notify_onelevel
commit 2d88a06480645a3023f10990bb9b3a615b739605
Author: Volker Lendecke <vl at samba.org>
Date: Thu Aug 12 12:55:11 2010 +0200
s3: Reduce the load on the echo handler
If the parent is fast enough, the echo handler should not step in. When the
socket becomes readable, the echo handler goes to sleep for a second. If within
that second, the parent has picked up the SMB request from the net, the echo
handler will just go back to select().
commit ae678d7c87c7783014cf4b66c7b2aa4f6077f3fd
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 9 17:46:12 2010 +0200
v3-4-ctdb: Bump ctdb vendor patch level to 11
commit 00f79937b191c5a9c5314ee2ab8245a50264dc94
Author: Volker Lendecke <vl at samba.org>
Date: Fri Aug 6 12:32:30 2010 +0200
v3-4-ctdb: fail db_open_ctdb if ctdb is not around
commit 74ea870dd487b240270eb017c8ca9bae595f48a5
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jul 28 17:02:43 2010 +0200
Further refine the time_audit warning message
commit 193e3f27066d9c70f4dcb088afa1404964c3fa1b
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jul 28 11:21:50 2010 +0200
s3: Modify the warning time_audit warning message
Now we have
System call "disk_free" took unexpectedly long (0.01 seconds) -- check your file system and disks!
commit 8def70861966088cde0ae4b5135297831b083e65
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 23 12:22:23 2010 +0200
s3: Log the correct core path on Linux if core_pattern is set
Contributions from Bill Hymas, IBM
commit 4fd361a1862c58723ad5fe06a163a9b50b2ac1b2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jul 5 13:00:40 2010 +0200
v3-4-ctdb: Bump up the vendor patch level to 10
commit ed4805e43ad0a0da8e91a3c3b87048392e18ce65
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jul 1 16:31:30 2010 +0200
v3-4-ctdb: Re-arrange winbindd_ads.c:query_user
We can't access the LDAP message after nss_get_info_cached has potentially
destroyed the ads_struct
commit 5c00bf89801bcb63b847d309360587047a76511e
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 25 11:47:30 2010 +0200
s3: Fix a winbind crash
nss_get_info_cached might deep inside sequence_number() invalidate the
ads_struct without telling its callers.
commit ed1b0c39d71a852b6885363ddced4248a06ff986
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 22 15:59:44 2010 +0200
s3: Fix a winbind crash
nss_get_info_cached might have invalidated "ads" deep inside.
-----------------------------------------------------------------------
Summary of changes:
README.v3-4-ctdb | 4 +-
libcli/security/sddl.c | 53 +++++---
source3/VERSION | 2 +-
source3/configure.in | 9 ++
source3/lib/dbwrap_ctdb.c | 5 +
source3/lib/fault.c | 57 ++++++++-
source3/modules/vfs_time_audit.c | 254 ++++++++++++++++++--------------------
source3/smbd/notify.c | 3 +-
source3/smbd/process.c | 2 +
source3/smbd/signing.c | 11 +-
source3/winbindd/winbindd_ads.c | 41 +++++--
11 files changed, 265 insertions(+), 176 deletions(-)
Changeset truncated at 500 lines:
diff --git a/README.v3-4-ctdb b/README.v3-4-ctdb
index 5d8dc28..ddd653d 100644
--- a/README.v3-4-ctdb
+++ b/README.v3-4-ctdb
@@ -5,8 +5,8 @@ especially with a focus on the support of some features of
the GPFS file system, and a few patches that have not been
accepted upstream yet.
-This branch is regularly _rebased_ on top of the upstream
-branch v3-4-test which collects the reviewed bugfix patches
+This branch is regularly _re-based_ on top of the upstream
+branch v3-4-test which collects the reviewed bug-fix patches
for the next 3.4.X release.
Michael
diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 1c49409..5542ab7 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -467,8 +467,8 @@ static char *sddl_encode_ace(TALLOC_CTX *mem_ctx, const struct security_ace *ace
{
char *sddl = NULL;
TALLOC_CTX *tmp_ctx;
- const char *s_type="", *s_flags="", *s_mask="",
- *s_object="", *s_iobject="", *s_trustee="";
+ const char *sddl_type="", *sddl_flags="", *sddl_mask="",
+ *sddl_object="", *sddl_iobject="", *sddl_trustee="";
tmp_ctx = talloc_new(mem_ctx);
if (tmp_ctx == NULL) {
@@ -476,16 +476,25 @@ static char *sddl_encode_ace(TALLOC_CTX *mem_ctx, const struct security_ace *ace
return NULL;
}
- s_type = sddl_flags_to_string(tmp_ctx, ace_types, ace->type, true);
- if (s_type == NULL) goto failed;
+ sddl_type = sddl_flags_to_string(tmp_ctx, ace_types, ace->type, true);
+ if (sddl_type == NULL) {
+ goto failed;
+ }
- s_flags = sddl_flags_to_string(tmp_ctx, ace_flags, ace->flags, true);
- if (s_flags == NULL) goto failed;
+ sddl_flags = sddl_flags_to_string(tmp_ctx, ace_flags, ace->flags,
+ true);
+ if (sddl_flags == NULL) {
+ goto failed;
+ }
- s_mask = sddl_flags_to_string(tmp_ctx, ace_access_mask, ace->access_mask, true);
- if (s_mask == NULL) {
- s_mask = talloc_asprintf(tmp_ctx, "0x%08x", ace->access_mask);
- if (s_mask == NULL) goto failed;
+ sddl_mask = sddl_flags_to_string(tmp_ctx, ace_access_mask,
+ ace->access_mask, true);
+ if (sddl_mask == NULL) {
+ sddl_mask = talloc_asprintf(tmp_ctx, "0x%08x",
+ ace->access_mask);
+ if (sddl_mask == NULL) {
+ goto failed;
+ }
}
if (ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT ||
@@ -493,21 +502,29 @@ static char *sddl_encode_ace(TALLOC_CTX *mem_ctx, const struct security_ace *ace
ace->type == SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT ||
ace->type == SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT) {
if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
- s_object = GUID_string(tmp_ctx, &ace->object.object.type.type);
- if (s_object == NULL) goto failed;
+ sddl_object = GUID_string(
+ tmp_ctx, &ace->object.object.type.type);
+ if (sddl_object == NULL) {
+ goto failed;
+ }
}
if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
- s_iobject = GUID_string(tmp_ctx, &ace->object.object.inherited_type.inherited_type);
- if (s_iobject == NULL) goto failed;
+ sddl_iobject = GUID_string(tmp_ctx, &ace->object.object.inherited_type.inherited_type);
+ if (sddl_iobject == NULL) {
+ goto failed;
+ }
}
}
-
- s_trustee = sddl_encode_sid(tmp_ctx, &ace->trustee, domain_sid);
- if (s_trustee == NULL) goto failed;
+
+ sddl_trustee = sddl_encode_sid(tmp_ctx, &ace->trustee, domain_sid);
+ if (sddl_trustee == NULL) {
+ goto failed;
+ }
sddl = talloc_asprintf(mem_ctx, "%s;%s;%s;%s;%s;%s",
- s_type, s_flags, s_mask, s_object, s_iobject, s_trustee);
+ sddl_type, sddl_flags, sddl_mask, sddl_object,
+ sddl_iobject, sddl_trustee);
failed:
talloc_free(tmp_ctx);
diff --git a/source3/VERSION b/source3/VERSION
index 8807241..bacef36 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# #
########################################################
SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=9
+SAMBA_VERSION_VENDOR_PATCH=11
########################################################
# This can be set by vendors if they want.. #
diff --git a/source3/configure.in b/source3/configure.in
index f7c0677..fa5d138 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1085,6 +1085,15 @@ AC_CHECK_LIB(exc, trace_back_stack)
# check for sysctlbyname for BSD systems
AC_CHECK_FUNCS(sysctlbyname)
+#################################################
+# Check to see if core dump directory is defined in linux
+# with /proc/sys/kernel/core_pattern
+
+AC_CHECK_FILE([/proc/sys/kernel/core_pattern],
+ AC_DEFINE(HAVE_SYS_KERNEL_PROC_CORE_PATTERN, 1,
+ [Whether Linux kernel uses core_pattern for core files]),
+ [])
+
#############################
# check if building with gpfs
AC_CHECK_HEADERS(gpfs_gpl.h)
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 329d63c..6887575 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -1295,6 +1295,11 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
db_ctdb->db = result;
conn = messaging_ctdbd_connection();
+ if (conn == NULL) {
+ DEBUG(1, ("Could not connect to ctdb\n"));
+ TALLOC_FREE(result);
+ return NULL;
+ }
if (!NT_STATUS_IS_OK(ctdbd_db_attach(conn, name, &db_ctdb->db_id, tdb_flags))) {
DEBUG(0, ("ctdbd_db_attach failed for %s\n", name));
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index bf61bb2..6430c8e 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -192,6 +192,52 @@ static char *get_freebsd_corepath(void)
}
#endif
+#if defined(HAVE_SYS_KERNEL_PROC_CORE_PATTERN)
+
+/**
+ * Get the Linux corepath.
+ *
+ * On Linux the contents of /proc/sys/kernel/core_pattern indicates the
+ * location of the core path.
+ */
+static char *get_linux_corepath(void)
+{
+ char *end;
+ int fd;
+ char *result;
+
+ fd = open("/proc/sys/kernel/core_pattern", O_RDONLY, 0);
+ if (fd == -1) {
+ return NULL;
+ }
+
+ result = afdgets(fd, NULL, 0);
+ close(fd);
+
+ if (result == NULL) {
+ return NULL;
+ }
+
+ if (result[0] != '/') {
+ /*
+ * No absolute path, use the default (cwd)
+ */
+ TALLOC_FREE(result);
+ return NULL;
+ }
+ /* Strip off the common filename expansion */
+
+ end = strrchr_m(result, '/');
+
+ if ((end != result) /* this would be the only / */
+ && (end != NULL)) {
+ *end = '\0';
+ }
+ return result;
+}
+#endif
+
+
/**
* Try getting system-specific corepath if one exists.
*
@@ -200,11 +246,18 @@ static char *get_freebsd_corepath(void)
static char *get_corepath(const char *logbase, const char *progname)
{
#if (defined(FREEBSD) && defined(HAVE_SYSCTLBYNAME))
+ char *tmp_corepath = NULL;
+ tmp_corepath = get_freebsd_corepath();
- /* @todo: Add support for the linux corepath. */
+ /* If this has been set correctly, we're done. */
+ if (tmp_corepath) {
+ return tmp_corepath;
+ }
+#endif
+#if defined(HAVE_SYS_KERNEL_PROC_CORE_PATTERN)
char *tmp_corepath = NULL;
- tmp_corepath = get_freebsd_corepath();
+ tmp_corepath = get_linux_corepath();
/* If this has been set correctly, we're done. */
if (tmp_corepath) {
diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index fb22c19..31a8cdb 100644
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -32,6 +32,14 @@
static double audit_timeout;
+static void smb_time_audit_log(const char *syscallname, double elapsed)
+{
+ DEBUG(0, ("WARNING: System call \"%s\" took unexpectedly long "
+ "(%.2f seconds) -- Validate that file and storage "
+ "subsystems are operating normally\n", syscallname,
+ elapsed));
+}
+
static int smb_time_audit_connect(vfs_handle_struct *handle,
const char *svc, const char *user)
{
@@ -47,7 +55,7 @@ static int smb_time_audit_connect(vfs_handle_struct *handle,
result = SMB_VFS_NEXT_CONNECT(handle, svc, user);
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("connect: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("connect", timediff);
}
return result;
}
@@ -62,7 +70,7 @@ static void smb_time_audit_disconnect(vfs_handle_struct *handle)
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("disconnect: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("disconnect", timediff);
}
return;
@@ -84,7 +92,7 @@ static uint64_t smb_time_audit_disk_free(vfs_handle_struct *handle,
/* Don't have a reasonable notion of failure here */
if (timediff > audit_timeout) {
- DEBUG(0, ("disk_free: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("disk_free", timediff);
}
return result;
@@ -103,7 +111,7 @@ static int smb_time_audit_get_quota(struct vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("get_quota: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("get_quota", timediff);
}
return result;
}
@@ -121,7 +129,7 @@ static int smb_time_audit_set_quota(struct vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("set_quota: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("set_quota", timediff);
}
return result;
@@ -142,8 +150,7 @@ static int smb_time_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("get_shadow_copy_data: Took %.2f seconds\n",
- timediff));
+ smb_time_audit_log("get_shadow_copy_data", timediff);
}
return result;
@@ -162,7 +169,7 @@ static int smb_time_audit_statvfs(struct vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("statvfs: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("statvfs", timediff);
}
return result;
@@ -179,8 +186,7 @@ static int smb_time_audit_fs_capabilities(struct vfs_handle_struct *handle)
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("fs_capabilities: Took %.2f seconds\n",
- timediff));
+ smb_time_audit_log("fs_capabilities", timediff);
}
return result;
@@ -199,7 +205,7 @@ static SMB_STRUCT_DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("opendir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("opendir", timediff);
}
return result;
@@ -218,7 +224,7 @@ static SMB_STRUCT_DIRENT *smb_time_audit_readdir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("readdir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("readdir", timediff);
}
return result;
@@ -235,7 +241,7 @@ static void smb_time_audit_seekdir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("seekdir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("seekdir", timediff);
}
return;
@@ -253,7 +259,7 @@ static long smb_time_audit_telldir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("telldir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("telldir", timediff);
}
return result;
@@ -270,7 +276,7 @@ static void smb_time_audit_rewinddir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("rewinddir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("rewinddir", timediff);
}
return;
@@ -288,7 +294,7 @@ static int smb_time_audit_mkdir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("mkdir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("mkdir", timediff);
}
return result;
@@ -306,7 +312,7 @@ static int smb_time_audit_rmdir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("rmdir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("rmdir", timediff);
}
return result;
@@ -324,7 +330,7 @@ static int smb_time_audit_closedir(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("closedir: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("closedir", timediff);
}
return result;
@@ -341,7 +347,7 @@ static void smb_time_audit_init_search_op(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("init_search_op: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("init_search_op", timediff);
}
return;
}
@@ -359,7 +365,7 @@ static int smb_time_audit_open(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("open: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("open", timediff);
}
return result;
@@ -409,7 +415,7 @@ static NTSTATUS smb_time_audit_create_file(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("create_file: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("create_file", timediff);
}
return result;
@@ -426,7 +432,7 @@ static int smb_time_audit_close(vfs_handle_struct *handle, files_struct *fsp)
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("close: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("close", timediff);
}
return result;
@@ -444,7 +450,7 @@ static ssize_t smb_time_audit_read(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("read: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("read", timediff);
}
return result;
@@ -463,7 +469,7 @@ static ssize_t smb_time_audit_pread(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("pread: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("pread", timediff);
}
return result;
@@ -482,7 +488,7 @@ static ssize_t smb_time_audit_write(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("write: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("write", timediff);
}
return result;
@@ -502,7 +508,7 @@ static ssize_t smb_time_audit_pwrite(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("pwrite: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("pwrite", timediff);
}
return result;
@@ -521,7 +527,7 @@ static SMB_OFF_T smb_time_audit_lseek(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("lseek: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("lseek", timediff);
}
return result;
@@ -541,7 +547,7 @@ static ssize_t smb_time_audit_sendfile(vfs_handle_struct *handle, int tofd,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("sendfile: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("sendfile", timediff);
}
return result;
@@ -561,7 +567,7 @@ static ssize_t smb_time_audit_recvfile(vfs_handle_struct *handle, int fromfd,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("recvfile: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("recvfile", timediff);
}
return result;
@@ -579,7 +585,7 @@ static int smb_time_audit_rename(vfs_handle_struct *handle,
timediff = timeval_elapsed(&tv);
if (timediff > audit_timeout) {
- DEBUG(0, ("rename: Took %.2f seconds\n", timediff));
+ smb_time_audit_log("rename", timediff);
}
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list