[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-843-g0421fa9

Volker Lendecke vlendec at samba.org
Sun Apr 5 11:53:15 GMT 2009


The branch, master has been updated
       via  0421fa90ce2f140da95e51216677834896d77213 (commit)
       via  6d760a4a9fef0ca98cca56cc634712a215ab978a (commit)
       via  ac4c319ed7559b73ed3232251f9dbc659aa53970 (commit)
      from  d3825d5d1023bed835e04f4a99a59e1d3b5b4b81 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0421fa90ce2f140da95e51216677834896d77213
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 12 12:12:04 2009 +0100

    Keep the forked-smbd stdout reader around longer

commit 6d760a4a9fef0ca98cca56cc634712a215ab978a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 12 12:11:16 2009 +0100

    Ensure 0-termination for the forked-smbd debug output

commit ac4c319ed7559b73ed3232251f9dbc659aa53970
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 12 20:41:49 2009 +0100

    Pass the current debuglevel down to the forked smbd

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_client/rpc_transport_smbd.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/rpc_transport_smbd.c b/source3/rpc_client/rpc_transport_smbd.c
index bde8d04..eb64a34 100644
--- a/source3/rpc_client/rpc_transport_smbd.c
+++ b/source3/rpc_client/rpc_transport_smbd.c
@@ -88,6 +88,7 @@ static void rpc_cli_smbd_stdout_reader(struct event_context *ev,
 		TALLOC_FREE(fde);
 		return;
 	}
+	buf[nread] = '\0';
 
 	if (conn->stdout_callback.fn != NULL) {
 		conn->stdout_callback.fn(buf, nread,
@@ -309,7 +310,8 @@ struct async_req *rpc_cli_smbd_conn_init_send(TALLOC_CTX *mem_ctx,
 			printf("no memory");
 			exit(1);
 		}
-		if (asprintf(&smbd_cmd, "%s -F -S", smbd_cmd) == -1) {
+		if (asprintf(&smbd_cmd, "%s -F -S -d %d", smbd_cmd,
+			     DEBUGLEVEL) == -1) {
 			printf("no memory");
 			exit(1);
 		}
@@ -332,7 +334,7 @@ struct async_req *rpc_cli_smbd_conn_init_send(TALLOC_CTX *mem_ctx,
 		goto nomem;
 	}
 
-	if (event_add_fd(ev, subreq, state->conn->stdout_fd, EVENT_FD_READ,
+	if (event_add_fd(ev, state, state->conn->stdout_fd, EVENT_FD_READ,
 			 rpc_cli_smbd_stdout_reader, state->conn) == NULL) {
 		goto nomem;
 	}
@@ -456,7 +458,7 @@ static struct tevent_req *rpc_smbd_write_send(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	if (event_add_fd(ev, subreq, transp->conn->stdout_fd, EVENT_FD_READ,
+	if (event_add_fd(ev, state, transp->conn->stdout_fd, EVENT_FD_READ,
 			 rpc_cli_smbd_stdout_reader, transp->conn) == NULL) {
 		goto fail;
 	}
@@ -527,7 +529,7 @@ static struct tevent_req *rpc_smbd_read_send(TALLOC_CTX *mem_ctx,
 		goto fail;
 	}
 
-	if (event_add_fd(ev, subreq, transp->conn->stdout_fd, EVENT_FD_READ,
+	if (event_add_fd(ev, state, transp->conn->stdout_fd, EVENT_FD_READ,
 			 rpc_cli_smbd_stdout_reader, transp->conn) == NULL) {
 		goto fail;
 	}
@@ -600,6 +602,11 @@ struct async_req *rpc_transport_smbd_init_send(TALLOC_CTX *mem_ctx,
 	state->transport_smbd->conn = conn;
 	state->transport->priv = state->transport_smbd;
 
+	if (event_add_fd(ev, state, conn->stdout_fd, EVENT_FD_READ,
+			 rpc_cli_smbd_stdout_reader, conn) == NULL) {
+		goto fail;
+	}
+
 	subreq = rpc_transport_np_init_send(state, ev, conn->cli,
 					    abstract_syntax);
 	if (subreq == NULL) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list