Attachment 5271 Details for Bug 7098 – Patch for v3-5 and v3-4

[patch] Patch for v3-5 and v3-4

0001-s3-libsmb-don-t-reuse-the-callers-stype-variable-in-.patch (text/plain), 1.51 KB, created by Stefan Metzmacher on 2010-02-04 08:00:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-02-04 08:00:56 UTC

Size: 1.51 KB

patch

obsolete

>From c2e4746fa9d68e7601e8e90cc0144d2e65a695b6 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 4 Feb 2010 14:03:20 +0100
>Subject: [PATCH] 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
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit c2e4746fa9d68e7601e8e90cc0144d2e65a695b6)
>---
> source3/libsmb/clirap.c |    5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
>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);
> 			}
> 
>-- 
>1.6.3.3
>

Flags:

jra: review+

Actions: View

Attachments on bug 7098: 5271 | 5272