svn commit: samba r5865 - in trunk/source: include smbd

jra at samba.org jra at samba.org
Thu Mar 17 19:26:35 GMT 2005


Author: jra
Date: 2005-03-17 19:26:30 +0000 (Thu, 17 Mar 2005)
New Revision: 5865

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5865

Log:
Stop using 'INFO' names on find calls. Getting ready to fixup OS/2 EA
support.
Jeremy.

Modified:
   trunk/source/include/trans2.h
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/include/trans2.h
===================================================================
--- trunk/source/include/trans2.h	2005-03-17 19:26:23 UTC (rev 5864)
+++ trunk/source/include/trans2.h	2005-03-17 19:26:30 UTC (rev 5865)
@@ -226,6 +226,9 @@
 #define SMB_QUERY_FILE_STREAM_INFO	0x109
 #define SMB_QUERY_COMPRESSION_INFO	0x10b
 
+#define SMB_FIND_INFO_STANDARD			1
+#define SMB_FIND_EA_SIZE			2
+#define SMB_FIND_EA_LIST			3
 #define SMB_FIND_FILE_DIRECTORY_INFO		0x101
 #define SMB_FIND_FILE_FULL_DIRECTORY_INFO	0x102
 #define SMB_FIND_FILE_NAMES_INFO		0x103

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2005-03-17 19:26:23 UTC (rev 5864)
+++ trunk/source/smbd/trans2.c	2005-03-17 19:26:30 UTC (rev 5865)
@@ -970,8 +970,8 @@
 	nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
 
 	switch (info_level) {
-		case SMB_INFO_STANDARD:
-			DEBUG(10,("get_lanman2_dir_entry: SMB_INFO_STANDARD\n"));
+		case SMB_FIND_INFO_STANDARD:
+			DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_INFO_STANDARD\n"));
 			if(requires_resume_key) {
 				SIVAL(p,0,reskey);
 				p += 4;
@@ -1002,8 +1002,8 @@
 			p += len;
 			break;
 
-		case SMB_INFO_QUERY_EA_SIZE:
-			DEBUG(10,("get_lanman2_dir_entry: SMB_INFO_QUERY_EA_SIZE\n"));
+		case SMB_FIND_EA_SIZE:
+			DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_EA_SIZE\n"));
 			if(requires_resume_key) {
 				SIVAL(p,0,reskey);
 				p += 4;
@@ -1356,8 +1356,8 @@
 	}
  
 	switch (info_level) {
-		case SMB_INFO_STANDARD:
-		case SMB_INFO_QUERY_EA_SIZE:
+		case SMB_FIND_INFO_STANDARD:
+		case SMB_FIND_EA_SIZE:
 		case SMB_FIND_FILE_DIRECTORY_INFO:
 		case SMB_FIND_FILE_FULL_DIRECTORY_INFO:
 		case SMB_FIND_FILE_NAMES_INFO:
@@ -1600,8 +1600,8 @@
 	}
 
 	switch (info_level) {
-		case SMB_INFO_STANDARD:
-		case SMB_INFO_QUERY_EA_SIZE:
+		case SMB_FIND_INFO_STANDARD:
+		case SMB_FIND_EA_SIZE:
 		case SMB_FIND_FILE_DIRECTORY_INFO:
 		case SMB_FIND_FILE_FULL_DIRECTORY_INFO:
 		case SMB_FIND_FILE_NAMES_INFO:



More information about the samba-cvs mailing list