s3: Fix some error messages

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index b0755bb7383b640e7e4acd360b115a9ca4348075..29b2fc42129c8fe497193c27caeff3c379e55a78 100644 (file)
--- 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)) {
                                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)));
                }
                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)) {
                          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 "
        }
 
        DEBUG(10,("handle_aio_write_complete: scheduled aio_write completed "

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index beb802859b13d4f229e6deef71220b6c773e1865..3674c0dea12f05a32a07c7c75567d828012e85c2 100644 (file)
--- 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)) {
                    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);
 }
        }
        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)) {
                                  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;
                }
                TALLOC_FREE(req);
                return;

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 61db7129b15be1766be10d7214434ab8ed120dfe..f40b7dda4b02eaad4454cdd26e7db79d6e89ed76 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2174,7 +2174,7 @@ void chain_reply(struct smb_request *req)
                          true, req->seqnum+1,
                          IS_CONN_ENCRYPTED(req->conn)||req->encrypted,
                          &req->pcd)) {
                          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;
        }
        TALLOC_FREE(req->chain_outbuf);
        req->done = true;