svn commit: samba r8938 - branches/SAMBA_3_0/source/rpcclient trunk/source/rpcclient

[gd at samba.org]

Author: gd
Date: 2005-08-02 19:48:42 +0000 (Tue, 02 Aug 2005)
New Revision: 8938

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

Log:
fix querydispinfo search semantics.

Just in case some uses rpcclient for code-testing...

Guenther

Modified:
   branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
   trunk/source/rpcclient/cmd_samr.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_samr.c	2005-08-02 19:46:11 UTC (rev 8937)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_samr.c	2005-08-02 19:48:42 UTC (rev 8938)
@@ -1095,7 +1095,7 @@
 	}
 
 
-	while(1) {
+	do {
 
 		if (!got_params)
 			get_query_dispinfo_params(
@@ -1108,7 +1108,7 @@
 
 		loop_count++;
 
-		if (!NT_STATUS_IS_OK(result) && !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) 
+		if (NT_STATUS_IS_ERR(result))
 			break;
 
 		if (num_entries == 0) 
@@ -1133,7 +1133,7 @@
 				break;
 			}
 		}
-	}
+	} while ( NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
  done:
 	return result;

Modified: trunk/source/rpcclient/cmd_samr.c
===================================================================
--- trunk/source/rpcclient/cmd_samr.c	2005-08-02 19:46:11 UTC (rev 8937)
+++ trunk/source/rpcclient/cmd_samr.c	2005-08-02 19:48:42 UTC (rev 8938)
@@ -1095,7 +1095,7 @@
 	}
 
 
-	while(1) {
+	do {
 
 		if (!got_params)
 			get_query_dispinfo_params(
@@ -1108,7 +1108,7 @@
 
 		loop_count++;
 
-		if (!NT_STATUS_IS_OK(result) && !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES)) 
+		if (NT_STATUS_IS_ERR(result))
 			break;
 
 		if (num_entries == 0) 
@@ -1133,7 +1133,7 @@
 				break;
 			}
 		}
-	}
+	} while ( NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
  done:
 	return result;