svn commit: samba r25824 - in branches/SAMBA_4_0/source/librpc/rpc: .

[metze at samba.org]

Author: metze
Date: 2007-11-04 16:16:18 +0000 (Sun, 04 Nov 2007)
New Revision: 25824

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

Log:
- NT_STATUS_IS_ERR() is not the same as !NT_STATUS_IS_OK()
- make the success case some clear by returning NT_STATUS_OK

metze

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2007-11-03 11:21:04 UTC (rev 25823)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2007-11-04 16:16:18 UTC (rev 25824)
@@ -803,7 +803,7 @@
 		return status;
 	}
 
-	return status;	
+	return NT_STATUS_OK;	
 }
 
 

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2007-11-03 11:21:04 UTC (rev 25823)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2007-11-04 16:16:18 UTC (rev 25824)
@@ -443,7 +443,7 @@
 	ndr->flags |= LIBNDR_FLAG_NOALIGN;
 
 	status = ndr_pull_GUID(ndr, NDR_SCALARS | NDR_BUFFERS, &syntax->uuid);
-	if (NT_STATUS_IS_ERR(status)) {
+	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(mem_ctx);
 		return status;
 	}
@@ -453,7 +453,7 @@
 
 	talloc_free(mem_ctx);
 
-	return status;
+	return NT_STATUS_OK;
 }
 
 static DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *syntax)
@@ -1416,5 +1416,5 @@
 
 	*pp2 = p2;
 
-	return status;
+	return NT_STATUS_OK;
 }