svn commit: samba r18844 - in branches/SAMBA_4_0/source/torture/rpc: .

[gd at samba.org]

Author: gd
Date: 2006-09-23 09:13:48 +0000 (Sat, 23 Sep 2006)
New Revision: 18844

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

Log:
Workaround win2k behaviour (which returns WERR_NO_MORE_ITEMS instead of
WERR_OK) in the dfs torture test.

Guenther

Modified:
   branches/SAMBA_4_0/source/torture/rpc/dfs.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/dfs.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/dfs.c	2006-09-23 08:17:14 UTC (rev 18843)
+++ branches/SAMBA_4_0/source/torture/rpc/dfs.c	2006-09-23 09:13:48 UTC (rev 18844)
@@ -200,7 +200,8 @@
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("GetInfo failed - %s\n", nt_errstr(status));
 		return False;
-	} else if (!W_ERROR_IS_OK(r.out.result)) {
+	} else if (!W_ERROR_IS_OK(r.out.result) && 
+		   !W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, r.out.result)) {
 		printf("dfs_GetInfo failed - %s\n", win_errstr(r.out.result));
 		return False;
 	}
@@ -212,7 +213,7 @@
 {
 	BOOL ret = True;
 	/* 103, 104, 105, 106 is only available on Set */
-	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 100, 101, 102, 103, 104, 105, 106, 200, 300};
+	uint16_t levels[] = {1, 2, 3, 4, 5, 6, 7, 100, 101, 102, 103, 104, 105, 106};
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -310,7 +311,8 @@
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Enum failed - %s\n", nt_errstr(status));
 		return False;
-	} else if (!W_ERROR_IS_OK(r.out.result)) {
+	} else if (!W_ERROR_IS_OK(r.out.result) && 
+		   !W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, r.out.result)) {
 		printf("dfs_Enum failed - %s\n", win_errstr(r.out.result));
 		return False;
 	}