- added SMBntrename test suite

- allow username of form DOMAIN\username or DOMAIN/username

- added ntrename to gentest
(This used to be commit 2b464472c17b791eb5b117f89d5aaea2bf60f6ad)

1 files changed, 30 insertions, 5 deletions

diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 70cff11395..f010883f18 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -125,12 +125,37 @@ struct smb_rmdir {
 };
 
 /* struct used in rename() call */
-struct smb_rename {
+enum rename_level {RAW_RENAME_RENAME, RAW_RENAME_NTRENAME};
+
+union smb_rename {
 	struct {
-		const char *pattern1;
-		const char *pattern2;
-		uint16 attrib;
-	} in;
+		enum rename_level level;
+	} generic;
+
+	/* SMBrename interface */
+	struct {
+		enum rename_level level;
+
+		struct {
+			const char *pattern1;
+			const char *pattern2;
+			uint16 attrib;
+		} in;
+	} rename;
+
+
+	/* SMBntrename interface */
+	struct {
+		enum rename_level level;
+
+		struct {
+			uint16 attrib;
+			uint16 flags; /* see RENAME_FLAG_* */
+			uint32 root_fid; /* is it? */
+			const char *old_name;
+			const char *new_name;
+		} in;
+	} ntrename;
 };
 
 enum tcon_level {RAW_TCON_TCON, RAW_TCON_TCONX};