summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-24 02:05:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:16 -0500
commit443a22b7f77f8aa640b6c75b49d853d4614d34d1 (patch)
tree377bb76477708adcf16d5a860ef71bee86f2f85e /source4
parenta90eba6316b89c3e387e0c52af22b5344a5de2f2 (diff)
downloadsamba-443a22b7f77f8aa640b6c75b49d853d4614d34d1.tar.gz
samba-443a22b7f77f8aa640b6c75b49d853d4614d34d1.tar.bz2
samba-443a22b7f77f8aa640b6c75b49d853d4614d34d1.zip
r18860: fixed some code that bitrotted while we didn't have the safety check
with NTSTATUS, WERROR etc. (This used to be commit fddb85bfa8bb5df7812d226a7a6f6fb41ccf107f)
Diffstat (limited to 'source4')
-rw-r--r--source4/rpc_server/srvsvc/dcesrv_srvsvc.c12
-rw-r--r--source4/rpc_server/winreg/rpc_winreg.c2
-rw-r--r--source4/torture/rpc/oxidresolve.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index 983c51f137..f2d09527a3 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -1255,7 +1255,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
0,
0,
NULL);
- if (status != WERR_OK) {
+ if (W_ERROR_EQUAL(status, WERR_OK)) {
return status;
}
break;
@@ -1272,7 +1272,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
0,
0,
NULL);
- if (status != WERR_OK) {
+ if (W_ERROR_EQUAL(status, WERR_OK)) {
return status;
}
break;
@@ -1289,7 +1289,7 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
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 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
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 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
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 @@ static WERROR srvsvc_NetShareSetInfo(struct dcesrv_call_state *dce_call, TALLOC_
0,
0,
NULL);
- if (status != WERR_OK) {
+ if (W_ERROR_EQUAL(status, WERR_OK)) {
return status;
}
break;
diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index e32f620e5b..1282923836 100644
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -527,7 +527,7 @@ static WERROR winreg_GetVersion(struct dcesrv_call_state *dce_call, TALLOC_CTX *
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;
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 3643a85485..7366d372fe 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -61,7 +61,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
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;
}