[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Fri Feb 5 03:31:49 MST 2010


The branch, v3-5-test has been updated
       via  4de319a... s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum()
      from  4879e70... Add cross option to samba_cv_linux_getgrouplist_ok

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 4de319afb5dd520b0a72fadeabf70d2aafe262d5
Author: Stefan Metzmacher <metze at 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
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit c2e4746fa9d68e7601e8e90cc0144d2e65a695b6)
    
    Fix bug #7098 (smbclient -L gives wrong results with a large browse list).

-----------------------------------------------------------------------

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 c3ec82b..3f77378 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


More information about the samba-cvs mailing list