svn commit: samba r18860 - in branches/SAMBA_4_0/source: rpc_server/srvsvc rpc_server/winreg torture/rpc

tridge at samba.org tridge at samba.org
Sun Sep 24 02:05:38 GMT 2006


Author: tridge
Date: 2006-09-24 02:05:37 +0000 (Sun, 24 Sep 2006)
New Revision: 18860

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

Log:

fixed some code that bitrotted while we didn't have the safety check
with NTSTATUS, WERROR etc.

Modified:
   branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c
   branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
   branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c	2006-09-24 01:52:20 UTC (rev 18859)
+++ branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c	2006-09-24 02:05:37 UTC (rev 18860)
@@ -1255,7 +1255,7 @@
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1272,7 +1272,7 @@
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1289,7 +1289,7 @@
 					r->in.info.info2->max_users,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1306,7 +1306,7 @@
 					0,
 					r->in.info.info501->csc_policy,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1323,7 +1323,7 @@
 					r->in.info.info502->max_users,
 					0,
 					r->in.info.info502->sd);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;
@@ -1340,7 +1340,7 @@
 					0,
 					0,
 					NULL);
-		if (status != WERR_OK) {
+		if (W_ERROR_EQUAL(status, WERR_OK)) {
 			return status;
 		}
 		break;

Modified: branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c	2006-09-24 01:52:20 UTC (rev 18859)
+++ branches/SAMBA_4_0/source/rpc_server/winreg/rpc_winreg.c	2006-09-24 02:05:37 UTC (rev 18860)
@@ -527,7 +527,7 @@
 	DCESRV_PULL_HANDLE_FAULT(h, r->in.handle, HTYPE_REGKEY);
 
 	r->out.version = talloc(mem_ctx, uint32_t);
-	NT_STATUS_HAVE_NO_MEMORY(r->out.version);
+	W_ERROR_HAVE_NO_MEMORY(r->out.version);
 
 	*r->out.version = 5;
 

Modified: branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c	2006-09-24 01:52:20 UTC (rev 18859)
+++ branches/SAMBA_4_0/source/torture/rpc/oxidresolve.c	2006-09-24 02:05:37 UTC (rev 18860)
@@ -61,7 +61,7 @@
 		return 0;
 	}
 
-	if(!W_ERROR_IS_OK(r.out.hr)) {
+	if(!W_ERROR_IS_OK(*r.out.hr)) {
 		fprintf(stderr, "RemoteActivation: %s\n", win_errstr(*r.out.hr));
 		return 0;
 	}



More information about the samba-cvs mailing list