[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Sun Sep 21 14:44:04 MDT 2014
The branch, master has been updated
via 31d3224 smbd: fix a comment typo.
via 9b39602 s3: reset tracepoint handler in reinit_after fork.
via b3325c9 WHATSNEW: Fix typos.
from c84a66d WHATSNEW: Mention unix domain datagram messaging
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 31d322455084555220f0a4dab9d042cb4300da9a
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 21 09:32:53 2014 +0200
smbd: fix a comment typo.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Sun Sep 21 22:43:55 CEST 2014 on sn-devel-104
commit 9b3960226aa7d5c0ce146325f9e689a7d0c7e4e3
Author: Michael Adam <obnox at samba.org>
Date: Sun Sep 21 10:29:49 2014 +0200
s3: reset tracepoint handler in reinit_after fork.
This for instance fixes panics in the scavenger process
due to talloc stackframes not freed in order.
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit b3325c9d1d6c647dcf452b74df4c2e3b0568eb96
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Sep 21 20:07:41 2014 +0200
WHATSNEW: Fix typos.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 2 +-
source3/lib/util.c | 7 +++++--
source3/smbd/smb2_break.c | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 6fd9261..d9d1976 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -71,7 +71,7 @@ the reason for this is the same as for "winbind enum users = no"
and "winbind enum groups = no". Providing this information is not always
reliably possible, e.g. if there're trusted domains.
-Please consult the smb.conf manpage for more details of this new options.
+Please consult the smb.conf manpage for more details on these new options.
Larger IO sizes for SMB2/3 by default
=====================================
diff --git a/source3/lib/util.c b/source3/lib/util.c
index f11d6f1..7b2afa8 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -451,8 +451,11 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
goto done;
}
- if (ev_ctx && tevent_re_initialise(ev_ctx) != 0) {
- smb_panic(__location__ ": Failed to re-initialise event context");
+ if (ev_ctx != NULL) {
+ tevent_set_trace_callback(ev_ctx, NULL, NULL);
+ if (tevent_re_initialise(ev_ctx) != 0) {
+ smb_panic(__location__ ": Failed to re-initialise event context");
+ }
}
if (reinit_after_fork_pipe[0] != -1) {
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index ec20f8b..5c079ec 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -240,7 +240,7 @@ void send_break_message_smb2(files_struct *fsp, int level)
/*
* TODO: in future we should have a better algorithm
- * to find the correct connection for an break message.
+ * to find the correct connection for a break message.
* Then we also need some retries if a channel gets disconnected.
*/
xconn = fsp->conn->sconn->client->connections;
--
Samba Shared Repository
More information about the samba-cvs
mailing list