The branch, v3-5-test has been updated via 96f4bfc... Fix debug statements to use correct function name. Jeremy. (cherry picked from commit 31ce8eeb44d5060cfe85f42dc6ef092121b84a68) via 3404082... requires_resume_key is a bool not int. Jeremy. (cherry picked from commit 7ae10fb892084b821f29dd36287d6deeb360ea13) from 10556ed... Fix more of the RAW-SEARCH test. Older info levels are not 4 byte aligned (levels 1 - 3). Jeremy. (cherry picked from commit 6a61befe3798ecf0996887164f7437c3f25c33f9)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit 96f4bfc6ce6bd783a9d21d064eb4ad43be3b2a57 Author: Jeremy Allison <j...@samba.org> Date: Tue Nov 3 11:22:19 2009 -0800 Fix debug statements to use correct function name. Jeremy. (cherry picked from commit 31ce8eeb44d5060cfe85f42dc6ef092121b84a68) commit 34040826510a37b8a23dda8429b1520f990b5344 Author: Jeremy Allison <j...@samba.org> Date: Tue Nov 3 11:21:02 2009 -0800 requires_resume_key is a bool not int. Jeremy. (cherry picked from commit 7ae10fb892084b821f29dd36287d6deeb360ea13) ----------------------------------------------------------------------- Summary of changes: source3/smbd/trans2.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 178c02a..445817f 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1541,7 +1541,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, switch (info_level) { case SMB_FIND_INFO_STANDARD: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_INFO_STANDARD\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_INFO_STANDARD\n")); if(requires_resume_key) { SIVAL(p,0,reskey); p += 4; @@ -1577,7 +1577,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_EA_SIZE: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_EA_SIZE\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_EA_SIZE\n")); if (requires_resume_key) { SIVAL(p,0,reskey); p += 4; @@ -1621,7 +1621,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, struct ea_list *file_list = NULL; size_t ea_len = 0; - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_EA_LIST\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_EA_LIST\n")); if (!name_list) { return false; } @@ -1646,7 +1646,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, /* Max string size is 255 bytes. */ if (PTR_DIFF(p + 255 + ea_len,pdata) > space_remaining) { *out_of_space = true; - DEBUG(9,("get_lanman2_dir_entry: out of space\n")); + DEBUG(9,("smbd_marshall_dir_entry: out of space\n")); return False; /* Not finished - just out of space */ } @@ -1676,7 +1676,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, } case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_BOTH_DIRECTORY_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_BOTH_DIRECTORY_INFO\n")); was_8_3 = mangle_is_8_3(fname, True, conn->params); p += 4; SIVAL(p,0,reskey); p += 4; @@ -1743,7 +1743,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_FILE_DIRECTORY_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_DIRECTORY_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_DIRECTORY_INFO\n")); p += 4; SIVAL(p,0,reskey); p += 4; put_long_date_timespec(conn->ts_res,p,create_date_ts); p += 8; @@ -1779,7 +1779,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_FILE_FULL_DIRECTORY_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_FULL_DIRECTORY_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_FULL_DIRECTORY_INFO\n")); p += 4; SIVAL(p,0,reskey); p += 4; put_long_date_timespec(conn->ts_res,p,create_date_ts); p += 8; @@ -1822,7 +1822,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_FILE_NAMES_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_NAMES_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_NAMES_INFO\n")); p += 4; SIVAL(p,0,reskey); p += 4; p += 4; @@ -1854,7 +1854,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_ID_FULL_DIRECTORY_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_ID_FULL_DIRECTORY_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_ID_FULL_DIRECTORY_INFO\n")); p += 4; SIVAL(p,0,reskey); p += 4; put_long_date_timespec(conn->ts_res,p,create_date_ts); p += 8; @@ -1900,7 +1900,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, break; case SMB_FIND_ID_BOTH_DIRECTORY_INFO: - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_ID_BOTH_DIRECTORY_INFO\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_ID_BOTH_DIRECTORY_INFO\n")); was_8_3 = mangle_is_8_3(fname, True, conn->params); p += 4; SIVAL(p,0,reskey); p += 4; @@ -1980,14 +1980,14 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, /* Begin of SMB_QUERY_FILE_UNIX_BASIC */ if (info_level == SMB_FIND_FILE_UNIX) { - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_UNIX\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_UNIX\n")); p = store_file_unix_basic(conn, p, NULL, &smb_fname->st); len = srvstr_push(base_data, flags2, p, fname, PTR_DIFF(end_data, p), STR_TERMINATE); } else { - DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_FILE_UNIX_INFO2\n")); + DEBUG(10,("smbd_marshall_dir_entry: SMB_FIND_FILE_UNIX_INFO2\n")); p = store_file_unix_basic_info2(conn, p, NULL, &smb_fname->st); nameptr = p; @@ -2026,7 +2026,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx, if (PTR_DIFF(p,pdata) > space_remaining) { *out_of_space = true; - DEBUG(9,("get_lanman2_dir_entry: out of space\n")); + DEBUG(9,("smbd_marshall_dir_entry: out of space\n")); return false; /* Not finished - just out of space */ } @@ -2148,7 +2148,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, const char *path_mask, uint32 dirtype, int info_level, - int requires_resume_key, + bool requires_resume_key, bool dont_descend, bool ask_sharemode, char **ppdata, @@ -2160,14 +2160,9 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, int *last_entry_off, struct ea_list *name_list) { - bool resume_key = false; uint8_t align = 4; const bool do_pad = true; - if (requires_resume_key) { - resume_key = true; - } - if (info_level >= 1 && info_level <= 3) { /* No alignment on earlier info levels. */ align = 1; @@ -2175,7 +2170,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx, return smbd_dirptr_lanman2_entry(ctx, conn, dirptr, flags2, path_mask, dirtype, info_level, - resume_key, dont_descend, ask_sharemode, + requires_resume_key, dont_descend, ask_sharemode, align, do_pad, ppdata, base_data, end_data, space_remaining, -- Samba Shared Repository