[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  ea41798... s3: Fix some error messages (cherry picked from commit ad871b73a26f3b48a522c8374c00aa5ff7d2eb4c)
      from  f1fed29... s3-printing: fix BUG 7280 - auto printers not loading with registry config

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit ea4179813e64aa54105959f040531901acb6b65a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Aug 13 22:51:29 2010 +0200

    s3: Fix some error messages
    (cherry picked from commit ad871b73a26f3b48a522c8374c00aa5ff7d2eb4c)

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

Summary of changes:
 source3/smbd/aio.c     |    7 ++++---
 source3/smbd/ipc.c     |    7 ++++---
 source3/smbd/process.c |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index b0755bb..29b2fc4 100644
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -361,8 +361,8 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn,
 				true, aio_ex->smbreq->seqnum+1,
 				IS_CONN_ENCRYPTED(fsp->conn),
 				&aio_ex->smbreq->pcd)) {
-			exit_server_cleanly("handle_aio_write: srv_send_smb "
-					    "failed.");
+			exit_server_cleanly("schedule_aio_write_and_X: "
+					    "srv_send_smb failed.");
 		}
 		DEBUG(10,("schedule_aio_write_and_X: scheduled aio_write "
 			  "behind for file %s\n", fsp_str_dbg(fsp)));
@@ -725,7 +725,8 @@ static int handle_aio_write_complete(struct aio_extra *aio_ex, int errcode)
 			  true, aio_ex->smbreq->seqnum+1,
 			  IS_CONN_ENCRYPTED(fsp->conn),
 			  NULL)) {
-		exit_server_cleanly("handle_aio_write: srv_send_smb failed.");
+		exit_server_cleanly("handle_aio_write_complete: "
+				    "srv_send_smb failed.");
 	}
 
 	DEBUG(10,("handle_aio_write_complete: scheduled aio_write completed "
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index beb8028..3674c0d 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -317,7 +317,8 @@ static void api_dcerpc_cmd_write_done(struct tevent_req *subreq)
 		    true, req->seqnum+1,
 		    IS_CONN_ENCRYPTED(req->conn) || req->encrypted,
 		    &req->pcd)) {
-		exit_server_cleanly("construct_reply: srv_send_smb failed.");
+		exit_server_cleanly("api_dcerpc_cmd_write_done: "
+				    "srv_send_smb failed.");
 	}
 	TALLOC_FREE(req);
 }
@@ -344,8 +345,8 @@ static void api_dcerpc_cmd_read_done(struct tevent_req *subreq)
 				  true, req->seqnum+1,
 				  IS_CONN_ENCRYPTED(req->conn)
 				  ||req->encrypted, &req->pcd)) {
-			exit_server_cleanly("construct_reply: srv_send_smb "
-					    "failed.");
+			exit_server_cleanly("api_dcerpc_cmd_read_done: "
+					    "srv_send_smb failed.");
 		}
 		TALLOC_FREE(req);
 		return;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index cd975a6..9ec3faf 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2188,7 +2188,7 @@ void chain_reply(struct smb_request *req)
 			  true, req->seqnum+1,
 			  IS_CONN_ENCRYPTED(req->conn)||req->encrypted,
 			  &req->pcd)) {
-		exit_server_cleanly("construct_reply: srv_send_smb failed.");
+		exit_server_cleanly("chain_reply: srv_send_smb failed.");
 	}
 	TALLOC_FREE(req->chain_outbuf);
 	req->done = true;


-- 
Samba Shared Repository