svn commit: samba r24478 - in
branches/SAMBA_4_0/source/torture/raw: .
jra at samba.org
jra at samba.org
Thu Aug 16 01:05:19 GMT 2007
Author: jra
Date: 2007-08-16 01:05:18 +0000 (Thu, 16 Aug 2007)
New Revision: 24478
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24478
Log:
Check that NTrename also maps NT_STATUS_OBJECT_NAME_COLLISION
to ERRDOS, ERRrename.
Jeremy.
Modified:
branches/SAMBA_4_0/source/torture/raw/samba3misc.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/samba3misc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/samba3misc.c 2007-08-16 00:54:16 UTC (rev 24477)
+++ branches/SAMBA_4_0/source/torture/raw/samba3misc.c 2007-08-16 01:05:18 UTC (rev 24478)
@@ -549,13 +549,28 @@
/* Try the rename test. */
{
union smb_rename io;
+ memset(&io, '\0', sizeof(io));
io.rename.in.pattern1 = fpath1;
io.rename.in.pattern2 = fpath;
+ /* Try with SMBmv rename. */
status = smb_raw_rename(cli_nt->tree, &io);
CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
status = smb_raw_rename(cli_dos->tree, &io);
CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRrename));
+
+ /* Try with NT rename. */
+ io.generic.level = RAW_RENAME_NTRENAME;
+ io.ntrename.in.old_name = fpath1;
+ io.ntrename.in.new_name = fpath;
+ io.ntrename.in.attrib = 0;
+ io.ntrename.in.cluster_size = 0;
+ io.ntrename.in.flags = RENAME_FLAG_RENAME;
+
+ status = smb_raw_rename(cli_nt->tree, &io);
+ CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_COLLISION);
+ status = smb_raw_rename(cli_dos->tree, &io);
+ CHECK_STATUS(status, NT_STATUS_DOS(ERRDOS,ERRrename));
}
goto done;
More information about the samba-cvs
mailing list