From 8c8240c677de96070966026a5dc14c523663714a Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 20 Sep 2006 21:00:07 +0000 Subject: r18743: Mention share name in error output. Guenther (This used to be commit 18505ce2834e768e8f9fe09f7dbf2a3e93290e91) --- source4/libnet/libnet_share.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c index 51152fb072..c22256fe4b 100644 --- a/source4/libnet/libnet_share.c +++ b/source4/libnet/libnet_share.c @@ -138,14 +138,16 @@ NTSTATUS libnet_AddShare(struct libnet_context *ctx, if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetShareAdd on server '%s' failed" + "srvsvc_NetShareAdd '%s' on server '%s' failed" ": %s", - r->in.server_name, nt_errstr(status)); + r->in.share.name, r->in.server_name, + nt_errstr(status)); } else if (!W_ERROR_IS_OK(s.out.result)) { r->out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetShareAdd on server '%s' failed" + "srvsvc_NetShareAdd '%s' on server '%s' failed" ": %s", - r->in.server_name, win_errstr(s.out.result)); + r->in.share.name, r->in.server_name, + win_errstr(s.out.result)); status = werror_to_ntstatus(s.out.result); } @@ -181,14 +183,16 @@ NTSTATUS libnet_DelShare(struct libnet_context *ctx, status = dcerpc_srvsvc_NetShareDel(c.out.dcerpc_pipe, mem_ctx, &s); if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetShareDel on server '%s' failed" + "srvsvc_NetShareDel '%s' on server '%s' failed" ": %s", - r->in.server_name, nt_errstr(status)); + r->in.share_name, r->in.server_name, + nt_errstr(status)); } else if (!W_ERROR_IS_OK(s.out.result)) { r->out.error_string = talloc_asprintf(mem_ctx, - "srvsvc_NetShareDel on server '%s' failed" + "srvsvc_NetShareDel '%s' on server '%s' failed" ": %s", - r->in.server_name, win_errstr(s.out.result)); + r->in.share_name, r->in.server_name, + win_errstr(s.out.result)); status = werror_to_ntstatus(s.out.result); } -- cgit