summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-03-17 19:26:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:06 -0500
commit983a1f69aebaa63dac55a58061386c4bc86b919f (patch)
tree2b84c3398eb57ad48b1fd4e755cc8f6e3bb1333c /source3
parent51d318b47cb332ce40fe7db290b123c0e8edb4aa (diff)
downloadsamba-983a1f69aebaa63dac55a58061386c4bc86b919f.tar.gz
samba-983a1f69aebaa63dac55a58061386c4bc86b919f.tar.bz2
samba-983a1f69aebaa63dac55a58061386c4bc86b919f.zip
r5864: Stop using 'INFO' names on find calls. Getting ready to fixup OS/2 EA
support. Jeremy. (This used to be commit a417feaa4108b443850ef6e8f0da32b79d79db59)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/trans2.h3
-rw-r--r--source3/smbd/trans2.c16
2 files changed, 11 insertions, 8 deletions
diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index 68358344f4..ee0c10d966 100644
--- a/source3/include/trans2.h
+++ b/source3/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/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 05ff7d6785..fb44e98fce 100644
--- a/source3/smbd/trans2.c
+++ b/source3/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: