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

support.
Jeremy.

diff --git a/source/include/trans2.h b/source/include/trans2.h
index 68358344f4e071a3184688b95b29590458cfd80c..ee0c10d96660eef4970d65bcf242065db9fd3184 100644 (file)
--- a/source/include/trans2.h
+++ b/source/include/trans2.h
@@ -226,6 +226,9 @@ Byte offset   Type     name                description
 #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

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 05ff7d6785dce76c86c3a4d72cc0c9b0f6919221..fb44e98fcea522b7c75fb2844bdf34e168a76479 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -970,8 +970,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
        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 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                        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 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, max_data_bytes = %d\n",
        }
  
        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 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
        }
 
        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: