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

[abartlet at samba.org]

Author: abartlet
Date: 2005-09-28 05:38:20 +0000 (Wed, 28 Sep 2005)
New Revision: 10566

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

Log:
Clean up error messages to provide more accurate info.

Andrew Bartlett

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


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-09-28 04:50:02 UTC (rev 10565)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-09-28 05:38:20 UTC (rev 10566)
@@ -613,9 +613,15 @@
 
 	status = libnet_RpcConnect(ctx, c, c);
 	if (!NT_STATUS_IS_OK(status)) {
-		r->out.error_string = talloc_asprintf(mem_ctx,
-						"Connection to LSA pipe of PDC of domain '%s' failed: %s",
-						r->in.domain_name, nt_errstr(status));
+		if (r->in.level == LIBNET_JOINDOMAIN_AUTOMATIC) {
+			r->out.error_string = talloc_asprintf(mem_ctx,
+							      "Connection to LSA pipe of PDC of domain '%s' failed: %s",
+							      r->in.domain_name, nt_errstr(status));
+		} else {
+			r->out.error_string = talloc_asprintf(mem_ctx,
+							      "Connection to LSA pipe with binding '%s' failed: %s",
+							      r->in.binding, nt_errstr(status));
+		}
 		talloc_free(tmp_ctx);
 		return status;
 	}			
@@ -835,9 +841,8 @@
 			r->out.error_string = talloc_asprintf(mem_ctx,
 							      "samr_LookupNames for [%s] returns %d RIDs\n",
 							      r->in.account_name, ln.out.rids.count);
-			status = NT_STATUS_INVALID_PARAMETER;
 			talloc_free(tmp_ctx);
-			return status;	
+			return NT_STATUS_INVALID_PARAMETER;
 		}
 		
 		/* prepare samr_OpenUser */