The branch, master has been updated via c2e4746... s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum() from 6cf5bdd... s4-torture: handle NT_STATUS_CONNECTION_RESET
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c2e4746fa9d68e7601e8e90cc0144d2e65a695b6 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 4 14:03:20 2010 +0100 s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum() When we need to do more than one network operation to get the browse list we need to use the same 'stype' value each time. metze ----------------------------------------------------------------------- Summary of changes: source3/libsmb/clirap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 13e16b2..a9a13f7 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -342,6 +342,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, const char *p1; char *s1, *s2; TALLOC_CTX *frame = talloc_stackframe(); + uint32_t entry_stype; if (p + 26 > rdata_end) { TALLOC_FREE(frame); @@ -365,7 +366,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, len++; } - stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY; + entry_stype = IVAL(p,18) & ~SV_TYPE_LOCAL_LIST_ONLY; pull_string_talloc(frame,rdata,0, &s1,sname,16,STR_ASCII); @@ -377,7 +378,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, continue; } - fn(s1, stype, s2, state); + fn(s1, entry_stype, s2, state); TALLOC_FREE(frame); } -- Samba Shared Repository