diff options
author | Jeremy Allison <jra@samba.org> | 2008-02-22 13:38:03 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2008-02-22 13:38:03 -0800 |
commit | 49a367ed32a98c9bf48addfa3a4e16c1d6e444ff (patch) | |
tree | e9430b7bfca330050e0d040b583bba8893415643 /source3/smbd/trans2.c | |
parent | 5df1d8d550d66b1e52219bd15d24af5146c55ceb (diff) | |
parent | d88e40106f2864e0e105b5d4fe7c25c577df8643 (diff) | |
download | samba-49a367ed32a98c9bf48addfa3a4e16c1d6e444ff.tar.gz samba-49a367ed32a98c9bf48addfa3a4e16c1d6e444ff.tar.bz2 samba-49a367ed32a98c9bf48addfa3a4e16c1d6e444ff.zip |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit bcc5371b8e7f369e8d830d9cf687089514997248)
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r-- | source3/smbd/trans2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 1f7af82670..dc908846b3 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1017,7 +1017,7 @@ static void call_trans2open(connection_struct *conn, } size = get_file_size(sbuf); - fattr = dos_mode(conn,fname,&sbuf); + fattr = dos_mode(conn,fsp->fsp_name,&sbuf); mtime = sbuf.st_mtime; inode = sbuf.st_ino; if (fattr & aDIR) { @@ -1054,7 +1054,7 @@ static void call_trans2open(connection_struct *conn, SIVAL(params,20,inode); SSVAL(params,24,0); /* Padding. */ if (flags & 8) { - uint32 ea_size = estimate_ea_size(conn, fsp, fname); + uint32 ea_size = estimate_ea_size(conn, fsp, fsp->fsp_name); SIVAL(params, 26, ea_size); } else { SIVAL(params, 26, 0); |