Changeset 988 for vendor/current/source3/smbd/message.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/smbd/message.c (modified) (17 diffs)

vendor/current/source3/smbd/message.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
@@ -51 +52 @@
         fstring alpha_buf;
         char *s;
-
-        if (! (*lp_msg_command())) {
+        mode_t mask;
+
+        if (! (*lp_message_command(frame))) {
                 DEBUG(1,("no messaging command specified\n"));
                 goto done;
@@ -62 +64 @@
                 goto done;
         }
+        mask = umask(S_IRWXO | S_IRWXG);
         fd = mkstemp(name);
+        umask(mask);
 
         if (fd == -1) {
@@ -76 +80 @@
         if (!convert_string_talloc(talloc_tos(), CH_DOS, CH_UNIX, state->msg,
                                    talloc_get_size(state->msg), (void *)&msg,
-                                   &len, true)) {
+                                   &len)) {
                 DEBUG(3, ("Conversion failed, delivering message in DOS "
                           "codepage format\n"));
@@ -97 +101 @@
 
         /* run the command */
-        s = talloc_strdup(talloc_tos(), lp_msg_command());
+        s = lp_message_command(frame);
         if (s == NULL) {
                 goto done;
@@ -142 +146 @@
         struct msg_state *state;
         int len;
-        const char *msg;
-        const char *p;
+        const uint8_t *msg;
+        const uint8_t *p;
 
         START_PROFILE(SMBsends);
 
-        if (!(*lp_msg_command())) {
+        if (!(*lp_message_command(talloc_tos()))) {
                 reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
                 END_PROFILE(SMBsends);
@@ -155 +159 @@
         state = talloc(talloc_tos(), struct msg_state);
 
-        p = (const char *)req->buf + 1;
+        p = req->buf + 1;
         p += srvstr_pull_req_talloc(
                 state, req, &state->from, p, STR_ASCII|STR_TERMINATE) + 1;
@@ -191 +195 @@
 void reply_sendstrt(struct smb_request *req)
 {
-        const char *p;
+        struct smbXsrv_connection *xconn = req->xconn;
+        const uint8_t *p;
 
         START_PROFILE(SMBsendstrt);
 
-        if (!(*lp_msg_command())) {
+        if (!(*lp_message_command(talloc_tos()))) {
                 reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
                 END_PROFILE(SMBsendstrt);
@@ -201 +206 @@
         }
 
-        TALLOC_FREE(smbd_msg_state);
-
-        smbd_msg_state = TALLOC_ZERO_P(NULL, struct msg_state);
-
-        if (smbd_msg_state == NULL) {
+        TALLOC_FREE(xconn->smb1.msg_state);
+
+        xconn->smb1.msg_state = talloc_zero(xconn, struct msg_state);
+
+        if (xconn->smb1.msg_state == NULL) {
                 reply_nterror(req, NT_STATUS_NO_MEMORY);
                 END_PROFILE(SMBsendstrt);
@@ -211 +216 @@
         }
 
-        p = (const char *)req->buf+1;
+        p = req->buf+1;
         p += srvstr_pull_req_talloc(
-                smbd_msg_state, req, &smbd_msg_state->from, p,
+                xconn->smb1.msg_state, req,
+                &xconn->smb1.msg_state->from, p,
                 STR_ASCII|STR_TERMINATE) + 1;
         p += srvstr_pull_req_talloc(
-                smbd_msg_state, req, &smbd_msg_state->to, p,
+                xconn->smb1.msg_state, req,
+                &xconn->smb1.msg_state->to, p,
                 STR_ASCII|STR_TERMINATE) + 1;
 
-        DEBUG( 3, ( "SMBsendstrt (from %s to %s)\n", smbd_msg_state->from,
-                    smbd_msg_state->to ) );
+        DEBUG(3, ("SMBsendstrt (from %s to %s)\n",
+                  xconn->smb1.msg_state->from,
+                  xconn->smb1.msg_state->to));
 
         reply_outbuf(req, 0, 0);
@@ -235 +243 @@
 void reply_sendtxt(struct smb_request *req)
 {
+        struct smbXsrv_connection *xconn = req->xconn;
         int len;
         const char *msg;
@@ -242 +251 @@
         START_PROFILE(SMBsendtxt);
 
-        if (! (*lp_msg_command())) {
+        if (! (*lp_message_command(talloc_tos()))) {
                 reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
                 END_PROFILE(SMBsendtxt);
@@ -248 +257 @@
         }
 
-        if ((smbd_msg_state == NULL) || (req->buflen < 3)) {
+        if ((xconn->smb1.msg_state == NULL) || (req->buflen < 3)) {
                 reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
                 END_PROFILE(SMBsendtxt);
@@ -256 +265 @@
         msg = (const char *)req->buf + 1;
 
-        old_len = talloc_get_size(smbd_msg_state->msg);
+        old_len = talloc_get_size(xconn->smb1.msg_state->msg);
 
         len = MIN(SVAL(msg, 0), smbreq_bufrem(req, msg+2));
 
-        tmp = TALLOC_REALLOC_ARRAY(smbd_msg_state, smbd_msg_state->msg,
-                                   char, old_len + len);
+        tmp = talloc_realloc(xconn->smb1.msg_state,
+                             xconn->smb1.msg_state->msg,
+                             char, old_len + len);
 
         if (tmp == NULL) {
@@ -269 +279 @@
         }
 
-        smbd_msg_state->msg = tmp;
-
-        memcpy(&smbd_msg_state->msg[old_len], msg+2, len);
+        xconn->smb1.msg_state->msg = tmp;
+
+        memcpy(&xconn->smb1.msg_state->msg[old_len], msg+2, len);
 
         DEBUG( 3, ( "SMBsendtxt\n" ) );
@@ -288 +298 @@
 void reply_sendend(struct smb_request *req)
 {
+        struct smbXsrv_connection *xconn = req->xconn;
         START_PROFILE(SMBsendend);
 
-        if (! (*lp_msg_command())) {
+        if (! (*lp_message_command(talloc_tos()))) {
                 reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
                 END_PROFILE(SMBsendend);
@@ -298 +309 @@
         DEBUG(3,("SMBsendend\n"));
 
-        msg_deliver(smbd_msg_state);
-
-        TALLOC_FREE(smbd_msg_state);
+        msg_deliver(xconn->smb1.msg_state);
+
+        TALLOC_FREE(xconn->smb1.msg_state);
 
         reply_outbuf(req, 0, 0);