summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-01 05:46:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:08 -0500
commit475c958450c863a8fc530ccf5bb712bd7a6e8aa4 (patch)
tree08d9d560320bf4310569f77d701ab838dbb9196d /source4/smb_server
parent37fffa54cf7edb208dcb060c642f5b0acf11d4e6 (diff)
downloadsamba-475c958450c863a8fc530ccf5bb712bd7a6e8aa4.tar.gz
samba-475c958450c863a8fc530ccf5bb712bd7a6e8aa4.tar.bz2
samba-475c958450c863a8fc530ccf5bb712bd7a6e8aa4.zip
r3425: got rid of a bunch of cruft from rewrite.h
(This used to be commit 3f902f8d851d32fa81d89ed61bfda6edaea00984)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb_server.h1
-rw-r--r--source4/smb_server/trans2.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 53ef5cd575..054fc7c35d 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -213,7 +213,6 @@ struct smbsrv_connection {
/* the context associated with open files on an smb socket */
struct {
struct files_struct *files; /* open files */
- struct bitmap *file_bmap; /* bitmap used to allocate file handles */
/* a fsp to use when chaining */
struct files_struct *chain_fsp;
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index c5c48d3f64..3c447c555e 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -390,7 +390,7 @@ static NTSTATUS trans2_qfsinfo(struct smbsrv_request *req, struct smb_trans2 *tr
return status;
}
- memcpy(trans->out.data.data, guid_blob.data, GUID_SIZE);
+ memcpy(trans->out.data.data, guid_blob.data, guid_blob.length);
for (i=0;i<6;i++) {
SBVAL(trans->out.data.data, 16 + 8*i, fsinfo.objectid_information.out.unknown[i]);