s3: Remove smbd_server_fd() from reply_writebraw
[ira/wip.git] / source3 / smbd / reply.c
index 5107b1a9e238c7f0e9186e23477123aff0c563ac..4f2bac2c294cb538adb477d25e9b9f32b79f80db 100644 (file)
 */
 
 #include "includes.h"
+#include "printing.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/cli_spoolss.h"
+#include "rpc_client/cli_spoolss.h"
+#include "rpc_client/init_spoolss.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext
@@ -322,11 +326,11 @@ size_t srvstr_get_path_req(TALLOC_CTX *mem_ctx, struct smb_request *req,
 bool check_fsp_open(connection_struct *conn, struct smb_request *req,
                    files_struct *fsp)
 {
-       if (!(fsp) || !(conn)) {
+       if ((fsp == NULL) || (conn == NULL)) {
                reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return False;
        }
-       if (((conn) != (fsp)->conn) || req->vuid != (fsp)->vuid) {
+       if ((conn != fsp->conn) || (req->vuid != fsp->vuid)) {
                reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return False;
        }
@@ -343,15 +347,15 @@ bool check_fsp(connection_struct *conn, struct smb_request *req,
        if (!check_fsp_open(conn, req, fsp)) {
                return False;
        }
-       if ((fsp)->is_directory) {
+       if (fsp->is_directory) {
                reply_nterror(req, NT_STATUS_INVALID_DEVICE_REQUEST);
                return False;
        }
-       if ((fsp)->fh->fd == -1) {
+       if (fsp->fh->fd == -1) {
                reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                return False;
        }
-       (fsp)->num_smb_operations++;
+       fsp->num_smb_operations++;
        return True;
 }
 
@@ -386,23 +390,8 @@ bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req,
        return true;
 }
 
-/****************************************************************************
- Check if we have a correct fsp. Replacement for the FSP_BELONGS_CONN macro
-****************************************************************************/
-
-bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req,
-                     files_struct *fsp)
-{
-       if ((fsp) && (conn) && ((conn)==(fsp)->conn)
-           && (req->vuid == (fsp)->vuid)) {
-               return True;
-       }
-
-       reply_nterror(req, NT_STATUS_INVALID_HANDLE);
-       return False;
-}
-
-static bool netbios_session_retarget(const char *name, int name_type)
+static bool netbios_session_retarget(struct smbd_server_connection *sconn,
+                                    const char *name, int name_type)
 {
        char *trim_name;
        char *trim_name_type;
@@ -416,7 +405,7 @@ static bool netbios_session_retarget(const char *name, int name_type)
        bool ret = false;
        uint8_t outbuf[10];
 
-       if (get_socket_port(smbd_server_fd()) != 139) {
+       if (get_socket_port(sconn->sock) != 139) {
                return false;
        }
 
@@ -479,7 +468,7 @@ static bool netbios_session_retarget(const char *name, int name_type)
        *(uint32_t *)(outbuf+4) = in_addr->sin_addr.s_addr;
        *(uint16_t *)(outbuf+8) = htons(retarget_port);
 
-       if (!srv_send_smb(smbd_server_fd(), (char *)outbuf, false, 0, false,
+       if (!srv_send_smb(sconn->sock, (char *)outbuf, false, 0, false,
                          NULL)) {
                exit_server_cleanly("netbios_session_regarget: srv_send_smb "
                                    "failed.");
@@ -495,13 +484,12 @@ static bool netbios_session_retarget(const char *name, int name_type)
  Reply to a (netbios-level) special message.
 ****************************************************************************/
 
-void reply_special(char *inbuf)
+void reply_special(struct smbd_server_connection *sconn, char *inbuf)
 {
        int msg_type = CVAL(inbuf,0);
        int msg_flags = CVAL(inbuf,1);
        fstring name1,name2;
        char name_type1, name_type2;
-       struct smbd_server_connection *sconn = smbd_server_conn;
 
        /*
         * We only really use 4 bytes of the outbuf, but for the smb_setlen
@@ -535,7 +523,7 @@ void reply_special(char *inbuf)
                DEBUG(2,("netbios connect: name1=%s0x%x name2=%s0x%x\n",
                         name1, name_type1, name2, name_type2));
 
-               if (netbios_session_retarget(name1, name_type1)) {
+               if (netbios_session_retarget(sconn, name1, name_type1)) {
                        exit_server_cleanly("retargeted client");
                }
 
@@ -560,7 +548,7 @@ void reply_special(char *inbuf)
                        add_session_user(sconn, get_remote_machine_name());
                }
 
-               reload_services(True);
+               reload_services(sconn->msg_ctx, True);
                reopen_logs();
 
                sconn->nbt.got_session = true;
@@ -586,7 +574,7 @@ void reply_special(char *inbuf)
        DEBUG(5,("init msg_type=0x%x msg_flags=0x%x\n",
                    msg_type, msg_flags));
 
-       srv_send_smb(smbd_server_fd(), outbuf, false, 0, false, NULL);
+       srv_send_smb(sconn->sock, outbuf, false, 0, false, NULL);
        return;
 }
 
@@ -607,7 +595,7 @@ void reply_tcon(struct smb_request *req)
        const char *p;
        DATA_BLOB password_blob;
        TALLOC_CTX *ctx = talloc_tos();
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBtcon);
 
@@ -683,7 +671,7 @@ void reply_tcon_and_X(struct smb_request *req)
        char *path = NULL;
        const char *p, *q;
        uint16 tcon_flags;
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBtconX);
 
@@ -1367,7 +1355,7 @@ void reply_search(struct smb_request *req)
        TALLOC_CTX *ctx = talloc_tos();
        bool ask_sharemode = lp_parm_bool(SNUM(conn), "smbd", "search ask sharemode", true);
        struct dptr_struct *dirptr = NULL;
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBsearch);
 
@@ -1634,7 +1622,7 @@ void reply_fclose(struct smb_request *req)
        NTSTATUS err;
        bool path_contains_wcard = False;
        TALLOC_CTX *ctx = talloc_tos();
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBfclose);
 
@@ -2024,7 +2012,7 @@ void reply_open_and_X(struct smb_request *req)
        SSVAL(req->outbuf,smb_vwv11,smb_action);
 
        if (open_flags & EXTENDED_RESPONSE_REQUIRED) {
-               SIVAL(req->outbuf, smb_vwv15, STD_RIGHT_ALL_ACCESS);
+               SIVAL(req->outbuf, smb_vwv15, SEC_STD_ALL);
        }
 
        chain_reply(req);
@@ -2040,7 +2028,7 @@ void reply_open_and_X(struct smb_request *req)
 
 void reply_ulogoffX(struct smb_request *req)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
        user_struct *vuser;
 
        START_PROFILE(SMBulogoffX);
@@ -2822,7 +2810,8 @@ static ssize_t fake_sendfile(files_struct *fsp, SMB_OFF_T startpos,
                        memset(buf + ret, '\0', cur_read - ret);
                }
 
-               if (write_data(smbd_server_fd(),buf,cur_read) != cur_read) {
+               if (write_data(fsp->conn->sconn->sock, buf, cur_read)
+                   != cur_read) {
                        SAFE_FREE(buf);
                        return -1;
                }
@@ -2883,7 +2872,8 @@ static void sendfile_short_send(files_struct *fsp,
                        size_t to_write;
 
                        to_write = MIN(SHORT_SEND_BUFSIZE, smb_maxcnt - nread);
-                       if (write_data(smbd_server_fd(), buf, to_write) != to_write) {
+                       if (write_data(fsp->conn->sconn->sock, buf, to_write)
+                           != to_write) {
                                exit_server_cleanly("sendfile_short_send: "
                                        "write_data failed");
                        }
@@ -2898,17 +2888,17 @@ static void sendfile_short_send(files_struct *fsp,
  Return a readbraw error (4 bytes of zero).
 ****************************************************************************/
 
-static void reply_readbraw_error(void)
+static void reply_readbraw_error(struct smbd_server_connection *sconn)
 {
        char header[4];
 
        SIVAL(header,0,0);
 
-       smbd_lock_socket(smbd_server_conn);
-       if (write_data(smbd_server_fd(),header,4) != 4) {
+       smbd_lock_socket(sconn);
+       if (write_data(sconn->sock,header,4) != 4) {
                fail_readraw();
        }
-       smbd_unlock_socket(smbd_server_conn);
+       smbd_unlock_socket(sconn);
 }
 
 /****************************************************************************
@@ -2922,6 +2912,7 @@ static void send_file_readbraw(connection_struct *conn,
                               size_t nread,
                               ssize_t mincount)
 {
+       struct smbd_server_connection *sconn = req->sconn;
        char *outbuf = NULL;
        ssize_t ret=0;
 
@@ -2935,7 +2926,7 @@ static void send_file_readbraw(connection_struct *conn,
 
        if ( !req_is_in_chain(req) && (nread > 0) && (fsp->base_fsp == NULL) &&
            (fsp->wcp == NULL) &&
-           lp_use_sendfile(SNUM(conn), smbd_server_conn->smb1.signing_state) ) {
+           lp_use_sendfile(SNUM(conn), req->sconn->smb1.signing_state) ) {
                ssize_t sendfile_read = -1;
                char header[4];
                DATA_BLOB header_blob;
@@ -2943,8 +2934,10 @@ static void send_file_readbraw(connection_struct *conn,
                _smb_setlen(header,nread);
                header_blob = data_blob_const(header, 4);
 
-               if ((sendfile_read = SMB_VFS_SENDFILE(smbd_server_fd(), fsp,
-                               &header_blob, startpos, nread)) == -1) {
+               sendfile_read = SMB_VFS_SENDFILE(sconn->sock, fsp,
+                                                &header_blob, startpos,
+                                                nread);
+               if (sendfile_read == -1) {
                        /* Returning ENOSYS means no data at all was sent.
                         * Do this as a normal read. */
                        if (errno == ENOSYS) {
@@ -3004,7 +2997,7 @@ normal_readbraw:
        if (!outbuf) {
                DEBUG(0,("send_file_readbraw: TALLOC_ARRAY failed for size %u.\n",
                        (unsigned)(nread+4)));
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                return;
        }
 
@@ -3020,7 +3013,7 @@ normal_readbraw:
        }
 
        _smb_setlen(outbuf,ret);
-       if (write_data(smbd_server_fd(),outbuf,4+ret) != 4+ret)
+       if (write_data(sconn->sock, outbuf, 4+ret) != 4+ret)
                fail_readraw();
 
        TALLOC_FREE(outbuf);
@@ -3033,6 +3026,7 @@ normal_readbraw:
 void reply_readbraw(struct smb_request *req)
 {
        connection_struct *conn = req->conn;
+       struct smbd_server_connection *sconn = req->sconn;
        ssize_t maxcount,mincount;
        size_t nread = 0;
        SMB_OFF_T startpos;
@@ -3042,22 +3036,22 @@ void reply_readbraw(struct smb_request *req)
 
        START_PROFILE(SMBreadbraw);
 
-       if (srv_is_signing_active(smbd_server_conn) ||
+       if (srv_is_signing_active(sconn) ||
            is_encrypted_packet(req->inbuf)) {
                exit_server_cleanly("reply_readbraw: SMB signing/sealing is active - "
                        "raw reads/writes are disallowed.");
        }
 
        if (req->wct < 8) {
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                END_PROFILE(SMBreadbraw);
                return;
        }
 
-       if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
+       if (sconn->smb1.echo_handler.trusted_fde) {
                DEBUG(2,("SMBreadbraw rejected with NOT_SUPPORTED because of "
                         "'async smb echo handler = yes'\n"));
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                END_PROFILE(SMBreadbraw);
                return;
        }
@@ -3085,7 +3079,7 @@ void reply_readbraw(struct smb_request *req)
                DEBUG(3,("reply_readbraw: fnum %d not valid "
                        "- cache prime?\n",
                        (int)SVAL(req->vwv+0, 0)));
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                END_PROFILE(SMBreadbraw);
                return;
        }
@@ -3096,7 +3090,7 @@ void reply_readbraw(struct smb_request *req)
                                (fsp->access_mask & FILE_EXECUTE)))) {
                DEBUG(3,("reply_readbraw: fnum %d not readable.\n",
                                (int)SVAL(req->vwv+0, 0)));
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                END_PROFILE(SMBreadbraw);
                return;
        }
@@ -3134,7 +3128,7 @@ void reply_readbraw(struct smb_request *req)
                        DEBUG(0,("reply_readbraw: negative 64 bit "
                                "readraw offset (%.0f) !\n",
                                (double)startpos ));
-                       reply_readbraw_error();
+                       reply_readbraw_error(sconn);
                        END_PROFILE(SMBreadbraw);
                        return;
                }
@@ -3151,7 +3145,7 @@ void reply_readbraw(struct smb_request *req)
            &lock);
 
        if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
-               reply_readbraw_error();
+               reply_readbraw_error(sconn);
                END_PROFILE(SMBreadbraw);
                return;
        }
@@ -3206,7 +3200,7 @@ void reply_lockread(struct smb_request *req)
        files_struct *fsp;
        struct byte_range_lock *br_lck = NULL;
        char *p = NULL;
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBlockread);
 
@@ -3246,7 +3240,7 @@ void reply_lockread(struct smb_request *req)
         * Note that the requested lock size is unaffected by max_recv.
         */
 
-       br_lck = do_lock(smbd_messaging_context(),
+       br_lck = do_lock(req->sconn->msg_ctx,
                        fsp,
                        (uint64_t)req->smbpid,
                        (uint64_t)numtoread,
@@ -3316,7 +3310,7 @@ void reply_read(struct smb_request *req)
        int outsize = 0;
        files_struct *fsp;
        struct lock_struct lock;
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBread);
 
@@ -3470,7 +3464,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
        if (!req_is_in_chain(req) &&
            !is_encrypted_packet(req->inbuf) && (fsp->base_fsp == NULL) &&
            (fsp->wcp == NULL) &&
-           lp_use_sendfile(SNUM(conn), smbd_server_conn->smb1.signing_state) ) {
+           lp_use_sendfile(SNUM(conn), req->sconn->smb1.signing_state) ) {
                uint8 headerbuf[smb_size + 12 * 2];
                DATA_BLOB header;
 
@@ -3485,7 +3479,9 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req,
                construct_reply_common_req(req, (char *)headerbuf);
                setup_readX_header(req, (char *)headerbuf, smb_maxcnt);
 
-               if ((nread = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header, startpos, smb_maxcnt)) == -1) {
+               nread = SMB_VFS_SENDFILE(req->sconn->sock, fsp, &header,
+                                        startpos, smb_maxcnt);
+               if (nread == -1) {
                        /* Returning ENOSYS means no data at all was sent.
                           Do this as a normal read. */
                        if (errno == ENOSYS) {
@@ -3560,7 +3556,7 @@ normal_read:
                setup_readX_header(req, (char *)headerbuf, smb_maxcnt);
 
                /* Send out the header. */
-               if (write_data(smbd_server_fd(), (char *)headerbuf,
+               if (write_data(req->sconn->sock, (char *)headerbuf,
                               sizeof(headerbuf)) != sizeof(headerbuf)) {
                        DEBUG(0,("send_file_readX: write_data failed for file "
                                 "%s (%s). Terminating\n", fsp_str_dbg(fsp),
@@ -3660,7 +3656,7 @@ void reply_read_and_X(struct smb_request *req)
                                return;
                        }
                        /* We currently don't do this on signed or sealed data. */
-                       if (srv_is_signing_active(smbd_server_conn) ||
+                       if (srv_is_signing_active(req->sconn) ||
                            is_encrypted_packet(req->inbuf)) {
                                reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
                                END_PROFILE(SMBreadX);
@@ -3722,9 +3718,9 @@ void reply_read_and_X(struct smb_request *req)
                /* NT_STATUS_RETRY - fall back to sync read. */
        }
 
-       smbd_lock_socket(smbd_server_conn);
+       smbd_lock_socket(req->sconn);
        send_file_readX(conn, req, fsp, startpos, smb_maxcnt);
-       smbd_unlock_socket(smbd_server_conn);
+       smbd_unlock_socket(req->sconn);
 
  out:
        END_PROFILE(SMBreadX);
@@ -3773,7 +3769,7 @@ void reply_writebraw(struct smb_request *req)
         */
        SCVAL(req->inbuf,smb_com,SMBwritec);
 
-       if (srv_is_signing_active(smbd_server_conn)) {
+       if (srv_is_signing_active(req->sconn)) {
                END_PROFILE(SMBwritebraw);
                exit_server_cleanly("reply_writebraw: SMB signing is active - "
                                "raw reads/writes are disallowed.");
@@ -3786,7 +3782,7 @@ void reply_writebraw(struct smb_request *req)
                return;
        }
 
-       if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
+       if (req->sconn->smb1.echo_handler.trusted_fde) {
                DEBUG(2,("SMBwritebraw rejected with NOT_SUPPORTED because of "
                         "'async smb echo handler = yes'\n"));
                reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
@@ -3878,7 +3874,7 @@ void reply_writebraw(struct smb_request *req)
        SCVAL(buf,smb_com,SMBwritebraw);
        SSVALS(buf,smb_vwv0,0xFFFF);
        show_msg(buf);
-       if (!srv_send_smb(smbd_server_fd(),
+       if (!srv_send_smb(req->sconn->sock,
                          buf,
                          false, 0, /* no signing */
                          IS_CONN_ENCRYPTED(conn),
@@ -3888,7 +3884,7 @@ void reply_writebraw(struct smb_request *req)
        }
 
        /* Now read the raw data into the buffer and write it */
-       status = read_smb_length(smbd_server_fd(), buf, SMB_SECONDARY_WAIT,
+       status = read_smb_length(req->sconn->sock, buf, SMB_SECONDARY_WAIT,
                                 &numtowrite);
        if (!NT_STATUS_IS_OK(status)) {
                exit_server_cleanly("secondary writebraw failed");
@@ -3912,7 +3908,7 @@ void reply_writebraw(struct smb_request *req)
                                (int)tcount,(int)nwritten,(int)numtowrite));
                }
 
-               status = read_data(smbd_server_fd(), buf+4, numtowrite);
+               status = read_data(req->sconn->sock, buf+4, numtowrite);
 
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0,("reply_writebraw: Oversize secondary write "
@@ -3972,7 +3968,7 @@ void reply_writebraw(struct smb_request *req)
                 * sending a SMBkeepalive. Thanks to DaveCB at Sun for this.
                 * JRA.
                 */
-               if (!send_keepalive(smbd_server_fd())) {
+               if (!send_keepalive(req->sconn->sock)) {
                        exit_server_cleanly("reply_writebraw: send of "
                                "keepalive failed");
                }
@@ -4075,7 +4071,7 @@ void reply_writeunlock(struct smb_request *req)
        }
 
        if (numtowrite && !fsp->print_file) {
-               status = do_unlock(smbd_messaging_context(),
+               status = do_unlock(req->sconn->msg_ctx,
                                fsp,
                                (uint64_t)req->smbpid,
                                (uint64_t)numtowrite, 
@@ -4238,13 +4234,13 @@ strict_unlock:
                                                (2*14) + /* word count (including bcc) */ \
                                                1 /* pad byte */)
 
-bool is_valid_writeX_buffer(const uint8_t *inbuf)
+bool is_valid_writeX_buffer(struct smbd_server_connection *sconn,
+                           const uint8_t *inbuf)
 {
        size_t numtowrite;
        connection_struct *conn = NULL;
        unsigned int doff = 0;
        size_t len = smb_len_large(inbuf);
-       struct smbd_server_connection *sconn = smbd_server_conn;
 
        if (is_encrypted_packet(inbuf)) {
                /* Can't do this on encrypted
@@ -4863,7 +4859,7 @@ void reply_lock(struct smb_request *req)
        DEBUG(3,("lock fd=%d fnum=%d offset=%.0f count=%.0f\n",
                 fsp->fh->fd, fsp->fnum, (double)offset, (double)count));
 
-       br_lck = do_lock(smbd_messaging_context(),
+       br_lck = do_lock(req->sconn->msg_ctx,
                        fsp,
                        (uint64_t)req->smbpid,
                        count,
@@ -4918,7 +4914,7 @@ void reply_unlock(struct smb_request *req)
        count = (uint64_t)IVAL(req->vwv+1, 0);
        offset = (uint64_t)IVAL(req->vwv+3, 0);
 
-       status = do_unlock(smbd_messaging_context(),
+       status = do_unlock(req->sconn->msg_ctx,
                        fsp,
                        (uint64_t)req->smbpid,
                        count,
@@ -5068,7 +5064,7 @@ void reply_printopen(struct smb_request *req)
        }
 
        /* Open for exclusive use, write only. */
-       status = print_fsp_open(req, conn, NULL, req->vuid, fsp);
+       status = print_spool_open(fsp, NULL, req->vuid);
 
        if (!NT_STATUS_IS_OK(status)) {
                file_free(req, fsp);
@@ -5176,38 +5172,100 @@ void reply_printqueue(struct smb_request *req)
                 start_index, max_count));
 
        {
-               print_queue_struct *queue = NULL;
-               print_status_struct status;
-               int count = print_queue_status(SNUM(conn), &queue, &status);
-               int num_to_get = ABS(max_count);
-               int first = (max_count>0?start_index:start_index+max_count+1);
-               int i;
-
-               if (first >= count)
-                       num_to_get = 0;
-               else
-                       num_to_get = MIN(num_to_get,count-first);
+               TALLOC_CTX *mem_ctx = talloc_tos();
+               NTSTATUS status;
+               WERROR werr;
+               const char *sharename = lp_servicename(SNUM(conn));
+               struct rpc_pipe_client *cli = NULL;
+               struct policy_handle handle;
+               struct spoolss_DevmodeContainer devmode_ctr;
+               union spoolss_JobInfo *info;
+               uint32_t count;
+               uint32_t num_to_get;
+               uint32_t first;
+               uint32_t i;
+
+               ZERO_STRUCT(handle);
+
+               status = rpc_connect_spoolss_pipe(conn, &cli);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(0, ("reply_printqueue: "
+                                 "could not connect to spoolss: %s\n",
+                                 nt_errstr(status)));
+                       reply_nterror(req, status);
+                       goto out;
+               }
+
+               ZERO_STRUCT(devmode_ctr);
+
+               status = rpccli_spoolss_OpenPrinter(cli, mem_ctx,
+                                               sharename,
+                                               NULL, devmode_ctr,
+                                               SEC_FLAG_MAXIMUM_ALLOWED,
+                                               &handle,
+                                               &werr);
+               if (!NT_STATUS_IS_OK(status)) {
+                       reply_nterror(req, status);
+                       goto out;
+               }
+               if (!W_ERROR_IS_OK(werr)) {
+                       reply_nterror(req, werror_to_ntstatus(werr));
+                       goto out;
+               }
+
+               werr = rpccli_spoolss_enumjobs(cli, mem_ctx,
+                                              &handle,
+                                              0, /* firstjob */
+                                              0xff, /* numjobs */
+                                              2, /* level */
+                                              0, /* offered */
+                                              &count,
+                                              &info);
+               if (!W_ERROR_IS_OK(werr)) {
+                       reply_nterror(req, werror_to_ntstatus(werr));
+                       goto out;
+               }
 
+               if (max_count > 0) {
+                       first = start_index;
+               } else {
+                       first = start_index + max_count + 1;
+               }
+
+               if (first >= count) {
+                       num_to_get = first;
+               } else {
+                       num_to_get = first + MIN(ABS(max_count), count - first);
+               }
 
-               for (i=first;i<first+num_to_get;i++) {
+               for (i = first; i < num_to_get; i++) {
                        char blob[28];
                        char *p = blob;
+                       time_t qtime = spoolss_Time_to_time_t(&info[i].info2.submitted);
+                       int qstatus;
+                       uint16_t qrapjobid = pjobid_to_rap(sharename,
+                                                       info[i].info2.job_id);
 
-                       srv_put_dos_date2(p,0,queue[i].time);
-                       SCVAL(p,4,(queue[i].status==LPQ_PRINTING?2:3));
-                       SSVAL(p,5, queue[i].job);
-                       SIVAL(p,7,queue[i].size);
-                       SCVAL(p,11,0);
+                       if (info[i].info2.status == JOB_STATUS_PRINTING) {
+                               qstatus = 2;
+                       } else {
+                               qstatus = 3;
+                       }
+
+                       srv_put_dos_date2(p, 0, qtime);
+                       SCVAL(p, 4, qstatus);
+                       SSVAL(p, 5, qrapjobid);
+                       SIVAL(p, 7, info[i].info2.size);
+                       SCVAL(p, 11, 0);
                        srvstr_push(blob, req->flags2, p+12,
-                                   queue[i].fs_user, 16, STR_ASCII);
+                                   info[i].info2.notify_name, 16, STR_ASCII);
 
                        if (message_push_blob(
                                    &req->outbuf,
                                    data_blob_const(
                                            blob, sizeof(blob))) == -1) {
                                reply_nterror(req, NT_STATUS_NO_MEMORY);
-                               END_PROFILE(SMBsplretq);
-                               return;
+                               goto out;
                        }
                }
 
@@ -5219,9 +5277,15 @@ void reply_printqueue(struct smb_request *req)
                        SSVAL(smb_buf(req->outbuf),1,28*count);
                }
 
-               SAFE_FREE(queue);
 
-               DEBUG(3,("%d entries returned in queue\n",count));
+               DEBUG(3, ("%u entries returned in queue\n",
+                         (unsigned)count));
+
+out:
+               if (cli && is_valid_policy_hnd(&handle)) {
+                       rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
+               }
+
        }
 
        END_PROFILE(SMBsplretq);
@@ -5254,7 +5318,7 @@ void reply_printwrite(struct smb_request *req)
                 return;
         }
 
-       if (!CAN_PRINT(conn)) {
+       if (!fsp->print_file) {
                reply_nterror(req, NT_STATUS_ACCESS_DENIED);
                END_PROFILE(SMBsplwr);
                return;
@@ -5368,7 +5432,7 @@ void reply_rmdir(struct smb_request *req)
        TALLOC_CTX *ctx = talloc_tos();
        files_struct *fsp = NULL;
        int info = 0;
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn = req->sconn;
 
        START_PROFILE(SMBrmdir);
 
@@ -5624,7 +5688,7 @@ static void rename_open_files(connection_struct *conn,
        }
 
        /* Send messages to all smbd's (not ourself) that the name has changed. */
-       rename_share_filename(smbd_messaging_context(), lck, conn->connectpath,
+       rename_share_filename(conn->sconn->msg_ctx, lck, conn->connectpath,
                              smb_fname_dst);
 
 }
@@ -7098,7 +7162,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                        return NT_STATUS_INVALID_PARAMETER;
                }
 
-               status = do_unlock(smbd_messaging_context(),
+               status = do_unlock(req->sconn->msg_ctx,
                                fsp,
                                e->smblctx,
                                e->count,
@@ -7192,7 +7256,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                        struct byte_range_lock *br_lck;
                        uint64_t block_smblctx;
 
-                       br_lck = do_lock(smbd_messaging_context(),
+                       br_lck = do_lock(req->sconn->msg_ctx,
                                        fsp,
                                        e->smblctx,
                                        e->count,
@@ -7224,7 +7288,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                         *
                         * Replacement for do_lock_spin(). JRA. */
 
-                       if (!smbd_server_conn->allow_smb2 &&
+                       if (!req->sconn->using_smb2 &&
                            br_lck && lp_blocking_locks(SNUM(conn)) &&
                            lp_lock_spin_time() && !blocking_lock &&
                            NT_STATUS_EQUAL((status),
@@ -7282,7 +7346,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                for(i--; i >= 0; i--) {
                        struct smbd_lock_element *e = &locks[i];
 
-                       do_unlock(smbd_messaging_context(),
+                       do_unlock(req->sconn->msg_ctx,
                                fsp,
                                e->smblctx,
                                e->count,