svn commit: samba r8709 - in branches/SAMBA_4_0/source/torture/raw: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-22 09:49:32 +0000 (Fri, 22 Jul 2005)
New Revision: 8709

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8709

Log:
fixed the assumption in RAW-SEARCH that directories are returned in sorted order

Modified:
   branches/SAMBA_4_0/source/torture/raw/search.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/search.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/search.c	2005-07-22 07:21:59 UTC (rev 8708)
+++ branches/SAMBA_4_0/source/torture/raw/search.c	2005-07-22 09:49:32 UTC (rev 8709)
@@ -1182,6 +1182,11 @@
 }
 
 
+static int ealist_cmp(union smb_search_data *r1, union smb_search_data *r2)
+{
+	return strcmp(r1->ea_list.name.s, r2->ea_list.name.s);
+}
+
 /* 
    testing of the rather strange ea_list level
 */
@@ -1252,7 +1257,7 @@
 	nxt.t2fnext.in.max_count = 2;
 	nxt.t2fnext.in.resume_key = result.list[1].ea_list.resume_key;
 	nxt.t2fnext.in.flags = FLAG_TRANS2_FIND_REQUIRE_RESUME | FLAG_TRANS2_FIND_CONTINUE;
-	nxt.t2fnext.in.last_name = "file2.txt";
+	nxt.t2fnext.in.last_name = result.list[1].ea_list.name.s;
 	nxt.t2fnext.in.num_names = 2;
 	nxt.t2fnext.in.ea_names = talloc_array(mem_ctx, struct ea_name, 2);
 	nxt.t2fnext.in.ea_names[0].name.s = "SECOND EA";
@@ -1262,6 +1267,10 @@
 				     &nxt, &result, multiple_search_callback);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
+	/* we have to sort the result as different servers can return directories
+	   in different orders */
+	qsort(result.list, result.count, sizeof(result.list[0]), 
+	      (comparison_fn_t)ealist_cmp);
 
 	CHECK_VALUE(result.count, 3);
 	CHECK_VALUE(result.list[0].ea_list.eas.num_eas, 2);