[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1311-gf3f9dfd

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  f3f9dfd667526611b1fed3d47dc60eb45932eee0 (commit)
       via  6b4b66c0cbf6147c693a84e6aec0b5cd07fd2e54 (commit)
      from  7f8e6b98822df2ea813e6a7da6a8f14c503935d9 (commit)

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


- Log -----------------------------------------------------------------
commit f3f9dfd667526611b1fed3d47dc60eb45932eee0
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 2 12:23:32 2009 +0200

    Second part of a fix for bug #6235.
    
    Domain enumeration breaks if master browser has space in name.

commit 6b4b66c0cbf6147c693a84e6aec0b5cd07fd2e54
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Fri Oct 2 12:22:25 2009 +0200

    Fix bug #6532.
    
    Domain enumeration breaks if master browser has space in name.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 219bbe6..44ecfce 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -625,7 +625,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
 				/*
 				 * Get the backup list ...
 				 */
-				if (!name_status_find(server, 0, 0,
+				if (!name_status_find(server, 0x20, 0x20,
                                                       &rem_ss, buserver)) {
 
                                         DEBUG(0,("Could not get name of "
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