summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-11-03 11:21:02 -0800
committerJeremy Allison <jra@samba.org>2009-11-03 11:21:02 -0800
commit7ae10fb892084b821f29dd36287d6deeb360ea13 (patch)
tree50512249cf192c50f9f7f11e27cc6605eab1a677
parent6a61befe3798ecf0996887164f7437c3f25c33f9 (diff)
downloadsamba-7ae10fb892084b821f29dd36287d6deeb360ea13.tar.gz
samba-7ae10fb892084b821f29dd36287d6deeb360ea13.tar.bz2
samba-7ae10fb892084b821f29dd36287d6deeb360ea13.zip
requires_resume_key is a bool not int.
Jeremy.
-rw-r--r--source3/smbd/trans2.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 178c02a31c..cbe382fedc 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -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,