svn commit: samba r5140 - in branches/SAMBA_3_0/source: rpc_client rpcclient

[jerry at samba.org]

Author: jerry
Date: 2005-01-31 16:32:14 +0000 (Mon, 31 Jan 2005)
New Revision: 5140

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

Log:
(a) fix problem with enumerating domain trusts in security = ads; (b) fix a segfault in rpcclient's dsenumdomtrusts
Modified:
   branches/SAMBA_3_0/source/rpc_client/cli_ds.c
   branches/SAMBA_3_0/source/rpcclient/cmd_ds.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_ds.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_client/cli_ds.c	2005-01-31 16:10:36 UTC (rev 5139)
+++ branches/SAMBA_3_0/source/rpc_client/cli_ds.c	2005-01-31 16:32:14 UTC (rev 5140)
@@ -110,7 +110,7 @@
 	init_q_ds_enum_domain_trusts( &q, server, flags );
 		
 	if (!ds_io_q_enum_domain_trusts("", &qbuf, 0, &q) 
-	    || !rpc_api_pipe_req(cli, PI_LSARPC_DS, DS_ENUM_DOM_TRUSTS, &qbuf, &rbuf)) {
+	    || !rpc_api_pipe_req(cli, PI_NETLOGON, DS_ENUM_DOM_TRUSTS, &qbuf, &rbuf)) {
 		result = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}

Modified: branches/SAMBA_3_0/source/rpcclient/cmd_ds.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_ds.c	2005-01-31 16:10:36 UTC (rev 5139)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_ds.c	2005-01-31 16:32:14 UTC (rev 5140)
@@ -55,14 +55,16 @@
 	uint32 			flags = 0x1;
 	struct ds_domain_trust	 *trusts = NULL;
 	unsigned int 			num_domains = 0;
+	int i;
 	
 	result = cli_ds_enum_domain_trusts( cli, mem_ctx, cli->desthost, flags, 
 		&trusts, &num_domains );
 	
 	printf( "%d domains returned\n", num_domains );
+
+	for (i=0; i<num_domains; i++ ) 
+		printf("%s (%s)\n", trusts[i].dns_domain, trusts[i].netbios_domain);
 	
-	SAFE_FREE( trusts );
-	
 	return result;
 }