diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-06-02 11:05:06 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-06-02 11:05:06 +1000 |
| commit | 405e64c437348bc9e3f7d4412a55e5cf05b3890d (patch) | |
| tree | 44ab09f604f6d780170536c300bebaeb5ee489d8 /source4/smb_server | |
| parent | fa327874bbbfc7ae1693adb1b87cae3f5d0857ec (diff) | |
| download | samba-405e64c437348bc9e3f7d4412a55e5cf05b3890d.tar.gz samba-405e64c437348bc9e3f7d4412a55e5cf05b3890d.tar.xz samba-405e64c437348bc9e3f7d4412a55e5cf05b3890d.zip | |
more updates for new info levels
(This used to be commit 85d1873ee92fcc7df3addc42ddb8189144901f8b)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb/trans2.c | 15 | ||||
| -rw-r--r-- | source4/smb_server/smb2/tcon.c | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index e5ba814cb21..711c86bb74b 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -588,12 +588,20 @@ static NTSTATUS trans2_parse_sfileinfo(struct smbsrv_request *req, case RAW_SFILEINFO_UNIX_BASIC: case RAW_SFILEINFO_UNIX_LINK: case RAW_SFILEINFO_UNIX_HLINK: - case RAW_SFILEINFO_1023: + case RAW_SFILEINFO_PIPE_INFORMATION: + case RAW_SFILEINFO_VALID_DATA_INFORMATION: + case RAW_SFILEINFO_SHORT_NAME_INFORMATION: case RAW_SFILEINFO_1025: + case RAW_SFILEINFO_1027: case RAW_SFILEINFO_1029: + case RAW_SFILEINFO_1030: + case RAW_SFILEINFO_1031: case RAW_SFILEINFO_1032: - case RAW_SFILEINFO_1039: - case RAW_SFILEINFO_1040: + case RAW_SFILEINFO_1036: + case RAW_SFILEINFO_1041: + case RAW_SFILEINFO_1042: + case RAW_SFILEINFO_1043: + case RAW_SFILEINFO_1044: return NT_STATUS_INVALID_LEVEL; default: @@ -784,6 +792,7 @@ static NTSTATUS find_fill_info(struct find_state *state, SMBSRV_REQ_DEFAULT_STR_FLAGS(req)); case RAW_SEARCH_DATA_UNIX_INFO: + case RAW_SEARCH_DATA_UNIX_INFO2: return NT_STATUS_INVALID_LEVEL; } diff --git a/source4/smb_server/smb2/tcon.c b/source4/smb_server/smb2/tcon.c index 040947f84f3..be64013bb25 100644 --- a/source4/smb_server/smb2/tcon.c +++ b/source4/smb_server/smb2/tcon.c @@ -327,7 +327,7 @@ static NTSTATUS smb2srv_tcon_backend(struct smb2srv_request *req, union smb_tcon req->ntvfs = ntvfs_request_create(req->tcon->ntvfs, req, req->session->session_info, - 0, /* TODO: fill in PID */ + SVAL(req->in.hdr, SMB2_HDR_PID), req->request_time, req, NULL, 0); if (!req->ntvfs) { |