[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1705-gc420e42

Günther Deschner gd at samba.org
Tue Jan 29 14:24:21 GMT 2008


The branch, v3-2-test has been updated
       via  c420e42adfea9908a93d3eea5688488e5a9062a2 (commit)
      from  1a900e08e92484407d69661517f08e675a3c352a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit c420e42adfea9908a93d3eea5688488e5a9062a2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jan 29 15:23:38 2008 +0100

    Finally delete rpccli_ds_enum_domain_trusts() completly.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in         |    2 +-
 source/rpc_client/cli_ds.c |   96 --------------------------------------------
 2 files changed, 1 insertions(+), 97 deletions(-)
 delete mode 100644 source/rpc_client/cli_ds.c


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index fe23245..3667dfe 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -396,7 +396,7 @@ RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o rpc_client/cli_srvsvc.o
 LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 	       $(RPC_CLIENT_OBJ1) rpc_client/cli_reg.o $(RPC_CLIENT_OBJ) \
 	       rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o  \
-	       rpc_client/cli_ds.o rpc_client/cli_svcctl.o
+	       rpc_client/cli_svcctl.o
 
 LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
 		   librpc/gen_ndr/cli_dfs.o \
diff --git a/source/rpc_client/cli_ds.c b/source/rpc_client/cli_ds.c
deleted file mode 100644
index c9724de..0000000
--- a/source/rpc_client/cli_ds.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   RPC pipe client
-   Copyright (C) Gerald Carter                        2002,
-   Copyright (C) Jeremy Allison				2005.
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-
-/* implementations of client side DsXXX() functions */
-
-/********************************************************************
- Enumerate trusted domains in an AD forest
-********************************************************************/
-
-NTSTATUS rpccli_ds_enum_domain_trusts(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx, 
-				      const char *server, uint32 flags, 
-				      struct ds_domain_trust **trusts,
-				      uint32 *num_domains)
-{
-	prs_struct qbuf, rbuf;
-	DS_Q_ENUM_DOM_TRUSTS q;
-	DS_R_ENUM_DOM_TRUSTS r;
-	NTSTATUS result;
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	init_q_ds_enum_domain_trusts( &q, server, flags );
-		
-	CLI_DO_RPC( cli, mem_ctx, PI_NETLOGON, DS_ENUM_DOM_TRUSTS,
-		q, r,
-		qbuf, rbuf,
-		ds_io_q_enum_domain_trusts,
-		ds_io_r_enum_domain_trusts,
-		NT_STATUS_UNSUCCESSFUL);
-	
-	result = r.status;
-	
-	if ( NT_STATUS_IS_OK(result) ) {
-		int i;
-	
-		*num_domains = r.num_domains;
-		if (r.num_domains) {
-			*trusts = TALLOC_ARRAY(mem_ctx, struct ds_domain_trust, r.num_domains);
-
-			if (*trusts == NULL) {
-				return NT_STATUS_NO_MEMORY;
-			}
-		} else {
-			*trusts = NULL;
-		}
-
-		for ( i=0; i< *num_domains; i++ ) {
-			(*trusts)[i].flags = r.domains.trusts[i].flags;
-			(*trusts)[i].parent_index = r.domains.trusts[i].parent_index;
-			(*trusts)[i].trust_type = r.domains.trusts[i].trust_type;
-			(*trusts)[i].trust_attributes = r.domains.trusts[i].trust_attributes;
-			(*trusts)[i].guid = r.domains.trusts[i].guid;
-
-			if (r.domains.trusts[i].sid_ptr) {
-				sid_copy(&(*trusts)[i].sid, &r.domains.trusts[i].sid.sid);
-			} else {
-				ZERO_STRUCT((*trusts)[i].sid);
-			}
-
-			if (r.domains.trusts[i].netbios_ptr) {
-				(*trusts)[i].netbios_domain = unistr2_to_ascii_talloc( mem_ctx, &r.domains.trusts[i].netbios_domain );
-			} else {
-				(*trusts)[i].netbios_domain = NULL;
-			}
-
-			if (r.domains.trusts[i].dns_ptr) {
-				(*trusts)[i].dns_domain = unistr2_to_ascii_talloc( mem_ctx, &r.domains.trusts[i].dns_domain );
-			} else {
-				(*trusts)[i].dns_domain = NULL;
-			}
-		}
-	}
-	
-	return result;
-}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list