svn commit: samba r19587 - in branches/SAMBA_4_0/source/libnet: .

[mimir at samba.org]

Author: mimir
Date: 2006-11-06 22:06:12 +0000 (Mon, 06 Nov 2006)
New Revision: 19587

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

Log:
Fix indentation and correctly set error string when completing
a composite call - don't leave it unset.


rafal


Modified:
   branches/SAMBA_4_0/source/libnet/libnet_rpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_rpc.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_rpc.c	2006-11-06 22:03:22 UTC (rev 19586)
+++ branches/SAMBA_4_0/source/libnet/libnet_rpc.c	2006-11-06 22:06:12 UTC (rev 19587)
@@ -112,7 +112,7 @@
 
 	/* connect to remote dcerpc pipe */
 	pipe_connect_req = dcerpc_pipe_connect_b_send(c, b, r->in.dcerpc_iface,
-						    ctx->cred, c->event_ctx);
+						      ctx->cred, c->event_ctx);
 	if (composite_nomem(pipe_connect_req, c)) return c;
 
 	composite_continue(c, pipe_connect_req, continue_pipe_connect, c);
@@ -134,7 +134,6 @@
 	/* receive result of rpc pipe connection */
 	c->status = dcerpc_pipe_connect_b_recv(ctx, c, &s->r.out.dcerpc_pipe);
 
-	s->r.out.error_string = NULL;
 	composite_done(c);
 }
 
@@ -173,8 +172,11 @@
 		} else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) {
 			ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 		}
+
+		r->out.error_string = talloc_strdup(mem_ctx, "Success");
+
 	} else {
-		r->out.error_string = talloc_steal(mem_ctx, s->r.out.error_string);
+		r->out.error_string = talloc_asprintf(mem_ctx, "Error: %s", nt_errstr(status));
 	}
 
 	talloc_free(c);