diff options
author | Gerald Carter <jerry@samba.org> | 2002-08-28 23:13:32 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-08-28 23:13:32 +0000 |
commit | f0a44a06d0640383cdafd7c6bcfbb2d71d91fcb1 (patch) | |
tree | 6a82f5d6ae181cc7b009b9d9238a9ec3075073d7 /source/smbd/nttrans.c | |
parent | eb7ce6ae02a5eea505a9c971c47e3048a6bfe171 (diff) | |
download | samba-f0a44a06d0640383cdafd7c6bcfbb2d71d91fcb1.tar.gz samba-f0a44a06d0640383cdafd7c6bcfbb2d71d91fcb1.tar.xz samba-f0a44a06d0640383cdafd7c6bcfbb2d71d91fcb1.zip |
another sync with SAMBA_2_2. Regenerated docs after vl new strip-links.pl
change
Diffstat (limited to 'source/smbd/nttrans.c')
-rw-r--r-- | source/smbd/nttrans.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 8cd43d88ba0..b80cac8d3c3 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -960,7 +960,10 @@ create_options = 0x%x root_dir_fid = 0x%x\n", flags, desired_access, file_attrib p++; SSVAL(p,0,fsp->fnum); p += 2; - SIVAL(p,0,smb_action); + if ((create_disposition == FILE_SUPERSEDE) && (smb_action == FILE_WAS_OVERWRITTEN)) + SIVAL(p,0,FILE_WAS_SUPERSEDED); + else + SIVAL(p,0,smb_action); p += 4; /* Create time. */ @@ -1461,7 +1464,10 @@ static int call_nt_transact_create(connection_struct *conn, p += 2; SSVAL(p,0,fsp->fnum); p += 2; - SIVAL(p,0,smb_action); + if ((create_disposition == FILE_SUPERSEDE) && (smb_action == FILE_WAS_OVERWRITTEN)) + SIVAL(p,0,FILE_WAS_SUPERSEDED); + else + SIVAL(p,0,smb_action); p += 8; /* Create time. */ |