The branch, master has been updated via d10c737 smbd_open_one_socket does not use the messaging_context variable so why pass it in? via ec423dc A small error message fix in source3/smbd/server.c from a390a58 scripting ntacls: Do not place a SACL in the GPO filesystem ACL
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d10c7378d96d322910e87c21a1a3a3b28b229687 Author: Richard Sharpe <realrichardsha...@gmail.com> Date: Tue Nov 13 13:53:35 2012 -0800 smbd_open_one_socket does not use the messaging_context variable so why pass it in? Reviewed by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Wed Nov 14 02:19:46 CET 2012 on sn-devel-104 commit ec423dc2eb1aae408b37034fd497ecef285f7fb9 Author: Richard Sharpe <realrichardsha...@gmail.com> Date: Tue Nov 13 11:27:53 2012 -0800 A small error message fix in source3/smbd/server.c Removes some incorrect info from an error message (probably from its old place when it was copied). Reviewed by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/smbd/server.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 7113eae..1cd9288 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -551,7 +551,7 @@ static void smbd_accept_connection(struct tevent_context *ev, return; if (fd == -1) { - DEBUG(0,("open_sockets_smbd: accept: %s\n", + DEBUG(0,("accept: %s\n", strerror(errno))); return; } @@ -662,7 +662,6 @@ static void smbd_accept_connection(struct tevent_context *ev, static bool smbd_open_one_socket(struct smbd_parent_context *parent, struct tevent_context *ev_ctx, - struct messaging_context *msg_ctx, const struct sockaddr_storage *ifss, uint16_t port) { @@ -792,7 +791,6 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, if (!smbd_open_one_socket(parent, ev_ctx, - msg_ctx, ifss, port)) { return false; @@ -834,7 +832,6 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, if (!smbd_open_one_socket(parent, ev_ctx, - msg_ctx, &ss, port)) { return false; -- Samba Shared Repository