Changeset 745 for trunk/server/source3/smbd/smb2_getinfo.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/smb2_getinfo.c (modified) (19 diffs)

trunk/server/source3/smbd/smb2_getinfo.c

@@ -4 +4 @@
 
    Copyright (C) Stefan Metzmacher 2009
+   Copyright (C) Jeremy Allison 2010
 
    This program is free software; you can redistribute it and/or modify
@@ -20 +21 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "trans2.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
@@ -35 +39 @@
 static NTSTATUS smbd_smb2_getinfo_recv(struct tevent_req *req,
                                        TALLOC_CTX *mem_ctx,
-                                       DATA_BLOB *out_output_buffer);
+                                       DATA_BLOB *out_output_buffer,
+                                       NTSTATUS *p_call_status);
 
 static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq);
@@ -96 +101 @@
         if (req->compat_chain_fsp) {
                 /* skip check */
-        } else if (in_file_id_persistent != 0) {
+        } else if (in_file_id_persistent != in_file_id_volatile) {
                 return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
         }
@@ -129 +134 @@
         DATA_BLOB out_output_buffer = data_blob_null;
         NTSTATUS status;
+        NTSTATUS call_status = NT_STATUS_OK;
         NTSTATUS error; /* transport error */
 
         status = smbd_smb2_getinfo_recv(subreq,
                                         req,
-                                        &out_output_buffer);
+                                        &out_output_buffer,
+                                        &call_status);
         TALLOC_FREE(subreq);
         if (!NT_STATUS_IS_OK(status)) {
@@ -145 +152 @@
         }
 
+        if (!NT_STATUS_IS_OK(call_status)) {
+                /* Return a specific error with data. */
+                error = smbd_smb2_request_error_ex(req,
+                                                call_status,
+                                                &out_output_buffer,
+                                                __location__);
+                if (!NT_STATUS_IS_OK(error)) {
+                        smbd_server_connection_terminate(req->sconn,
+                                                         nt_errstr(error));
+                        return;
+                }
+                return;
+        }
+
         out_output_buffer_offset = SMB2_HDR_BODY + 0x08;
 
@@ -181 +202 @@
         DATA_BLOB out_output_buffer;
 };
+
+static void smb2_ipc_getinfo(struct tevent_req *req,
+                                struct smbd_smb2_getinfo_state *state,
+                                struct tevent_context *ev,
+                                uint8_t in_info_type,
+                                uint8_t in_file_info_class)
+{
+        /* We want to reply to SMB2_GETINFO_FILE
+           with a class of SMB2_FILE_STANDARD_INFO as
+           otherwise a Win7 client issues this request
+           twice (2xroundtrips) if we return NOT_SUPPORTED.
+           NB. We do the same for SMB1 in call_trans2qpipeinfo() */
+
+        if (in_info_type == 0x01 && /* SMB2_GETINFO_FILE */
+                        in_file_info_class == 0x05) { /* SMB2_FILE_STANDARD_INFO */
+                state->out_output_buffer = data_blob_talloc(state,
+                                                NULL, 24);
+                if (tevent_req_nomem(state->out_output_buffer.data, req)) {
+                        return;
+                }
+
+                memset(state->out_output_buffer.data,0,24);
+                SOFF_T(state->out_output_buffer.data,0,4096LL);
+                SIVAL(state->out_output_buffer.data,16,1);
+                SIVAL(state->out_output_buffer.data,20,1);
+                tevent_req_done(req);
+        } else {
+                tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+        }
+}
 
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
@@ -198 +249 @@
         connection_struct *conn = smb2req->tcon->compat_conn;
         files_struct *fsp;
+        NTSTATUS status;
 
         req = tevent_req_create(mem_ctx, &state,
@@ -205 +257 @@
         }
         state->smb2req = smb2req;
-        state->status = NT_STATUS_INTERNAL_ERROR;
+        state->status = NT_STATUS_OK;
         state->out_output_buffer = data_blob_null;
 
@@ -231 +283 @@
 
         if (IS_IPC(conn)) {
-                tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+                smb2_ipc_getinfo(req, state, ev,
+                        in_info_type, in_file_info_class);
                 return tevent_req_post(req, ev);
         }
@@ -247 +300 @@
                 int lock_data_count = 0;
                 char *lock_data = NULL;
-                bool ms_dfs_link = false;
-                NTSTATUS status;
 
                 ZERO_STRUCT(write_time_ts);
@@ -274 +325 @@
                         /* We know this name is ok, it's already passed the checks. */
 
-                } else if (fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
+                } else if (fsp && fsp->fh->fd == -1) {
                         /*
                          * This is actually a QFILEINFO on a directory
@@ -304 +355 @@
                         fileid = vfs_file_id_from_sbuf(conn,
                                                        &fsp->fsp_name->st);
-                        get_file_infos(fileid, &delete_pending, &write_time_ts);
+                        get_file_infos(fileid, fsp->name_hash,
+                                &delete_pending, &write_time_ts);
                 } else {
                         /*
@@ -320 +372 @@
                         fileid = vfs_file_id_from_sbuf(conn,
                                                        &fsp->fsp_name->st);
-                        get_file_infos(fileid, &delete_pending, &write_time_ts);
+                        get_file_infos(fileid, fsp->name_hash,
+                                &delete_pending, &write_time_ts);
                 }
 
@@ -329 +382 @@
                                                delete_pending,
                                                write_time_ts,
-                                               ms_dfs_link,
                                                ea_list,
                                                lock_data_count,
@@ -363 +415 @@
                 char *data = NULL;
                 int data_size = 0;
-                NTSTATUS status;
 
                 /* the levels directly map to the passthru levels */
@@ -395 +446 @@
         }
 
+        case 0x03:/* SMB2_GETINFO_SEC */
+        {
+                uint8_t *p_marshalled_sd = NULL;
+                size_t sd_size = 0;
+
+                status = smbd_do_query_security_desc(conn,
+                                state,
+                                fsp,
+                                /* Security info wanted. */
+                                in_additional_information,
+                                in_output_buffer_length,
+                                &p_marshalled_sd,
+                                &sd_size);
+
+                if (NT_STATUS_EQUAL(status, NT_STATUS_BUFFER_TOO_SMALL)) {
+                        /* Return needed size. */
+                        state->out_output_buffer = data_blob_talloc(state,
+                                                                    NULL,
+                                                                    4);
+                        if (tevent_req_nomem(state->out_output_buffer.data, req)) {
+                                return tevent_req_post(req, ev);
+                        }
+                        SIVAL(state->out_output_buffer.data,0,(uint32_t)sd_size);
+                        state->status = NT_STATUS_BUFFER_TOO_SMALL;
+                        break;
+                }
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(10,("smbd_smb2_getinfo_send: "
+                                 "smbd_do_query_security_desc of %s failed "
+                                 "(%s)\n", fsp_str_dbg(fsp),
+                                 nt_errstr(status)));
+                        tevent_req_nterror(req, status);
+                        return tevent_req_post(req, ev);
+                }
+
+                if (sd_size > 0) {
+                        state->out_output_buffer = data_blob_talloc(state,
+                                                                    p_marshalled_sd,
+                                                                    sd_size);
+                        if (tevent_req_nomem(state->out_output_buffer.data, req)) {
+                                return tevent_req_post(req, ev);
+                        }
+                }
+                break;
+        }
+
         default:
+                DEBUG(10,("smbd_smb2_getinfo_send: "
+                        "unknown in_info_type of %u "
+                        " for file %s\n",
+                        (unsigned int)in_info_type,
+                        fsp_str_dbg(fsp) ));
+
                 tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
                 return tevent_req_post(req, ev);
@@ -406 +509 @@
 static NTSTATUS smbd_smb2_getinfo_recv(struct tevent_req *req,
                                        TALLOC_CTX *mem_ctx,
-                                       DATA_BLOB *out_output_buffer)
+                                       DATA_BLOB *out_output_buffer,
+                                       NTSTATUS *pstatus)
 {
         NTSTATUS status;
@@ -419 +523 @@
         *out_output_buffer = state->out_output_buffer;
         talloc_steal(mem_ctx, out_output_buffer->data);
+        *pstatus = state->status;
 
         tevent_req_received(req);