[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Wed Jan 16 01:02:05 UTC 2019
The branch, master has been updated
via 0b996afec2b profiling: stop smbprofile from growing unnecessarily
via dd231a16a33 python: dns_hub: Fix indentation of 'raise' on error.
from 09effcb53a9 s3-smbd: use fruit:model string for mDNS registration
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b996afec2ba4a4ba4e492123ca03f3b877a9db0
Author: Dylan Stephano-Shachter <dshachter at nasuni.com>
Date: Mon Jan 14 13:42:03 2019 -0500
profiling: stop smbprofile from growing unnecessarily
Signed-off-by: Dylan Stephano-Shachter <dshachter at nasuni.com>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Jan 16 02:01:55 CET 2019 on sn-devel-144
commit dd231a16a338cfe63d12cadf0fc3e2ebe7cac828
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 15 08:45:26 2019 -0800
python: dns_hub: Fix indentation of 'raise' on error.
Remove second socket.sendto().
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/dns_forwarder_helpers/dns_hub.py | 4 +---
source3/profile/profile.c | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/dns_forwarder_helpers/dns_hub.py b/python/samba/tests/dns_forwarder_helpers/dns_hub.py
index 81aa478f4ba..cf9beb7fa7a 100755
--- a/python/samba/tests/dns_forwarder_helpers/dns_hub.py
+++ b/python/samba/tests/dns_forwarder_helpers/dns_hub.py
@@ -123,9 +123,7 @@ class DnsHandler(sserver.BaseRequestHandler):
except socket.error as err:
print("Error sending %s to address %s for name %s: %s\n" %
(forwarder, self.client_address, name, err.errno))
- raise
-
- socket.sendto(send_packet, self.client_address)
+ raise
class server_thread(threading.Thread):
def __init__(self, server):
diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 5deef81b6df..5e7b69d25d6 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -271,6 +271,11 @@ void smbprofile_dump(void)
TALLOC_FREE(smbprofile_state.internal.te);
+ if (! (smbprofile_state.config.do_count ||
+ smbprofile_state.config.do_times)) {
+ return;
+ }
+
if (smbprofile_state.internal.db == NULL) {
return;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list