summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-05-24 11:32:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:33 -0500
commitd8376686cdfd4decbd06820afd8145f23f800ca9 (patch)
treedc9af151b82a67f0ea02be340015348ac59f41ed
parentd5e3f86ecef324415a056737b94d80510a22118f (diff)
downloadsamba-d8376686cdfd4decbd06820afd8145f23f800ca9.tar.gz
samba-d8376686cdfd4decbd06820afd8145f23f800ca9.tar.bz2
samba-d8376686cdfd4decbd06820afd8145f23f800ca9.zip
r15857: don't clear the error string after setting it
metze (This used to be commit d273d8ae52255170932405f488876510e02f5813)
-rw-r--r--source4/libnet/libnet_user.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index d0a4e39220..85c69b2fde 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -159,12 +159,13 @@ NTSTATUS libnet_CreateUser_recv(struct composite_context *c, TALLOC_CTX *mem_ctx
struct create_user_state *s;
status = composite_wait(c);
- if (!NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status)) {
+ r->out.error_string = NULL;
+ } else {
s = talloc_get_type(c->private_data, struct create_user_state);
r->out.error_string = talloc_steal(mem_ctx, s->r.out.error_string);
}
- r->out.error_string = NULL;
return status;
}
@@ -307,12 +308,13 @@ NTSTATUS libnet_DeleteUser_recv(struct composite_context *c, TALLOC_CTX *mem_ctx
struct delete_user_state *s;
status = composite_wait(c);
- if (!NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status)) {
+ r->out.error_string = NULL;
+ } else {
s = talloc_get_type(c->private_data, struct delete_user_state);
r->out.error_string = talloc_steal(mem_ctx, s->r.out.error_string);
}
- r->out.error_string = NULL;
return status;
}