[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1289-g641e125

[Derrell Lipman]

The branch, master has been updated
       via  641e12561ad863f8bff8c3a98485a010c138ec30 (commit)
      from  65527216f1289f366d83beb936a668b32cf44d38 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 641e12561ad863f8bff8c3a98485a010c138ec30
Author: Derrell Lipman <derrell at dworkin.(none)>
Date:   Mon Apr 27 09:27:52 2009 -0400

    [FIX Bug 6235] domain enumeration breaks if master browser has space in name
    
    Jeremy: please review to ensure this doesn't appear to break anything
    
    The function name_status_find() is documented as used for finding a server's
    name given its IP address. It was, however, looking for the first matching
    name which could be a group name at times. This fix ensures that group names
    are skipped when scanning for a matching name.
    
    Derrell

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

Summary of changes:
 source3/libsmb/namequery.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 19d89ce..50fb9f1 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -408,7 +408,8 @@ bool name_status_find(const char *q_name,
 		goto done;
 
 	for (i=0;i<count;i++) {
-		if (status[i].type == type)
+                /* Find first one of the requested type that's not a GROUP. */
+		if (status[i].type == type && ! (status[i].flags & 0x80))
 			break;
 	}
 	if (i == count)


-- 
Samba Shared Repository