r24557: rename 'dcerpc_table_' -> 'ndr_table_'

metze
(This used to be commit 84651aee81aaabbebf52ffc3fbcbabb2eec6eed5)

9 files changed, 23 insertions, 23 deletions

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index fa2ef17ca7..e2f4f03c60 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1522,7 +1522,7 @@ static void becomeDC_drsuapi_connect_send(struct libnet_BecomeDC_state *s,
 		if (!composite_is_ok(c)) return;
 	}
 
-	creq = dcerpc_pipe_connect_b_send(s, drsuapi->binding, &dcerpc_table_drsuapi,
+	creq = dcerpc_pipe_connect_b_send(s, drsuapi->binding, &ndr_table_drsuapi,
 					  s->libnet->cred, s->libnet->event_ctx);
 	composite_continue(c, creq, recv_fn, s);
 }
diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c
index 3de281d625..6fd3b59a05 100644
--- a/source4/libnet/libnet_domain.c
+++ b/source4/libnet/libnet_domain.c
@@ -284,7 +284,7 @@ struct composite_context *libnet_DomainOpenSamr_send(struct libnet_context *ctx,
 		/* attempting to connect a domain controller */
 		s->rpcconn.level           = LIBNET_RPC_CONNECT_DC;
 		s->rpcconn.in.name         = io->in.domain_name;
-		s->rpcconn.in.dcerpc_iface = &dcerpc_table_samr;
+		s->rpcconn.in.dcerpc_iface = &ndr_table_samr;
 		
 		/* send rpc pipe connect request */
 		rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn);
@@ -427,7 +427,7 @@ struct composite_context* libnet_DomainOpenLsa_send(struct libnet_context *ctx,
 		/* attempting to connect a domain controller */
 		s->rpcconn.level           = LIBNET_RPC_CONNECT_DC;
 		s->rpcconn.in.name         = talloc_strdup(c, io->in.domain_name);
-		s->rpcconn.in.dcerpc_iface = &dcerpc_table_lsarpc;
+		s->rpcconn.in.dcerpc_iface = &ndr_table_lsarpc;
 		
 		/* send rpc pipe connect request */
 		rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn);
@@ -1175,7 +1175,7 @@ struct composite_context* libnet_DomainList_send(struct libnet_context *ctx,
 		/* prepare rpc connect call */
 		s->rpcconn.level           = LIBNET_RPC_CONNECT_SERVER;
 		s->rpcconn.in.name         = s->hostname;
-		s->rpcconn.in.dcerpc_iface = &dcerpc_table_samr;
+		s->rpcconn.in.dcerpc_iface = &ndr_table_samr;
 
 		rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn);
 		if (composite_nomem(rpcconn_req, c)) return c;
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index cecf07ed4e..40debc63dc 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -110,7 +110,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J
 	status = dcerpc_pipe_connect_b(tmp_ctx, 
 				       &drsuapi_pipe,
 				       drsuapi_binding,
-				       &dcerpc_table_drsuapi,
+				       &ndr_table_drsuapi,
 				       ctx->cred, 
 				       ctx->event_ctx);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -479,7 +479,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
 	/* This level makes a connection to the LSA pipe on the way,
 	 * to get some useful bits of information about the domain */
 	connect_with_info->level              = LIBNET_RPC_CONNECT_DC_INFO;
-	connect_with_info->in.dcerpc_iface    = &dcerpc_table_samr;
+	connect_with_info->in.dcerpc_iface    = &ndr_table_samr;
 
 	/*
 	  establish the SAMR connection
@@ -503,7 +503,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
 
 	status = dcerpc_pipe_auth(tmp_ctx, &samr_pipe,
 				  connect_with_info->out.dcerpc_pipe->binding, 
-				  &dcerpc_table_samr, ctx->cred);
+				  &ndr_table_samr, ctx->cred);
 	if (!NT_STATUS_IS_OK(status)) {
 		r->out.error_string = talloc_asprintf(mem_ctx,
 						"SAMR bind failed: %s",
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 5d3af7c2e8..28d9ae8cbe 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -54,7 +54,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT
 	/* prepare connect to the SAMR pipe of the users domain PDC */
 	c.level                    = LIBNET_RPC_CONNECT_PDC;
 	c.in.name                  = r->samr.in.domain_name;
-	c.in.dcerpc_iface     	   = &dcerpc_table_samr;
+	c.in.dcerpc_iface     	   = &ndr_table_samr;
 
 	/* 1. connect to the SAMR pipe of users domain PDC (maybe a standalone server or workstation) */
 	status = libnet_RpcConnect(ctx, mem_ctx, &c);
@@ -538,7 +538,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX *
 	/* prepare connect to the SAMR pipe of users domain PDC */
 	c.level               = LIBNET_RPC_CONNECT_PDC;
 	c.in.name             = r->samr.in.domain_name;
-	c.in.dcerpc_iface     = &dcerpc_table_samr;
+	c.in.dcerpc_iface     = &ndr_table_samr;
 
 	/* 1. connect to the SAMR pipe of users domain PDC (maybe a standalone server or workstation) */
 	status = libnet_RpcConnect(ctx, mem_ctx, &c);
diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 02d7cf0c00..85dd6c43e7 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -186,10 +186,10 @@ static NTSTATUS libnet_RpcConnectSrv_recv(struct composite_context *c,
 		/* reference created pipe structure to long-term libnet_context
 		   so that it can be used by other api functions even after short-term
 		   mem_ctx is freed */
-		if (r->in.dcerpc_iface == &dcerpc_table_samr) {
+		if (r->in.dcerpc_iface == &ndr_table_samr) {
 			ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 
-		} else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) {
+		} else if (r->in.dcerpc_iface == &ndr_table_lsarpc) {
 			ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 		}
 
@@ -397,10 +397,10 @@ static NTSTATUS libnet_RpcConnectDC_recv(struct composite_context *c,
 		/* reference created pipe structure to long-term libnet_context
 		   so that it can be used by other api functions even after short-term
 		   mem_ctx is freed */
-		if (r->in.dcerpc_iface == &dcerpc_table_samr) {
+		if (r->in.dcerpc_iface == &ndr_table_samr) {
 			ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 
-		} else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) {
+		} else if (r->in.dcerpc_iface == &ndr_table_lsarpc) {
 			ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 		}
 
@@ -487,7 +487,7 @@ static struct composite_context* libnet_RpcConnectDCInfo_send(struct libnet_cont
 	}
 
 	/* we need to query information on lsarpc interface first */
-	s->rpc_conn.in.dcerpc_iface    = &dcerpc_table_lsarpc;
+	s->rpc_conn.in.dcerpc_iface    = &ndr_table_lsarpc;
 	
 	/* request connection to the lsa pipe on the pdc */
 	conn_req = libnet_RpcConnect_send(ctx, c, &s->rpc_conn, s->monitor_fn);
@@ -856,10 +856,10 @@ static NTSTATUS libnet_RpcConnectDCInfo_recv(struct composite_context *c, struct
 		/* reference created pipe structure to long-term libnet_context
 		   so that it can be used by other api functions even after short-term
 		   mem_ctx is freed */
-		if (r->in.dcerpc_iface == &dcerpc_table_samr) {
+		if (r->in.dcerpc_iface == &ndr_table_samr) {
 			ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 
-		} else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) {
+		} else if (r->in.dcerpc_iface == &ndr_table_lsarpc) {
 			ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe);
 		}
 
diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c
index 263e7c5119..e24ba8161a 100644
--- a/source4/libnet/libnet_share.c
+++ b/source4/libnet/libnet_share.c
@@ -37,7 +37,7 @@ NTSTATUS libnet_ListShares(struct libnet_context *ctx,
 
 	c.level               = LIBNET_RPC_CONNECT_SERVER;
 	c.in.name             = r->in.server_name;
-	c.in.dcerpc_iface     = &dcerpc_table_srvsvc;
+	c.in.dcerpc_iface     = &ndr_table_srvsvc;
 
 	s.in.server_unc = talloc_asprintf(mem_ctx, "\\\\%s", c.in.name);
 
@@ -118,7 +118,7 @@ NTSTATUS libnet_AddShare(struct libnet_context *ctx,
 
 	c.level              = LIBNET_RPC_CONNECT_SERVER;
 	c.in.name            = r->in.server_name;
-	c.in.dcerpc_iface    = &dcerpc_table_srvsvc;
+	c.in.dcerpc_iface    = &ndr_table_srvsvc;
 
 	status = libnet_RpcConnect(ctx, mem_ctx, &c);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -165,7 +165,7 @@ NTSTATUS libnet_DelShare(struct libnet_context *ctx,
 
 	c.level               = LIBNET_RPC_CONNECT_SERVER;
 	c.in.name             = r->in.server_name;
-	c.in.dcerpc_iface     = &dcerpc_table_srvsvc;
+	c.in.dcerpc_iface     = &ndr_table_srvsvc;
 
 	status = libnet_RpcConnect(ctx, mem_ctx, &c);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c
index ef06577c21..e1e53fb947 100644
--- a/source4/libnet/libnet_time.c
+++ b/source4/libnet/libnet_time.c
@@ -35,7 +35,7 @@ static NTSTATUS libnet_RemoteTOD_srvsvc(struct libnet_context *ctx, TALLOC_CTX *
 	/* prepare connect to the SRVSVC pipe of a timeserver */
 	c.level             = LIBNET_RPC_CONNECT_SERVER;
 	c.in.name           = r->srvsvc.in.server_name;
-	c.in.dcerpc_iface   = &dcerpc_table_srvsvc;
+	c.in.dcerpc_iface   = &ndr_table_srvsvc;
 
 	/* 1. connect to the SRVSVC pipe of a timeserver */
 	status = libnet_RpcConnect(ctx, mem_ctx, &c);
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 6305ac9a5e..6b63ebc839 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -537,7 +537,7 @@ static void unbecomeDC_drsuapi_connect_send(struct libnet_UnbecomeDC_state *s)
 	talloc_free(binding_str);
 	if (!composite_is_ok(c)) return;
 
-	creq = dcerpc_pipe_connect_b_send(s, s->drsuapi.binding, &dcerpc_table_drsuapi,
+	creq = dcerpc_pipe_connect_b_send(s, s->drsuapi.binding, &ndr_table_drsuapi,
 					  s->libnet->cred, s->libnet->event_ctx);
 	composite_continue(c, creq, unbecomeDC_drsuapi_connect_recv, s);
 }
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index d015a07730..e21976cb02 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -223,7 +223,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx
 	}
 	
 	/* prepare connect to the NETLOGON pipe of PDC */
-	c->in.dcerpc_iface      = &dcerpc_table_netlogon;
+	c->in.dcerpc_iface      = &ndr_table_netlogon;
 
 	/* We must do this as the machine, not as any command-line
 	 * user.  So we override the credentials in the
@@ -268,7 +268,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx
 		return nt_status;
 	}
 
-	nt_status = dcerpc_bind_auth_schannel(samsync_ctx, p, &dcerpc_table_netlogon,
+	nt_status = dcerpc_bind_auth_schannel(samsync_ctx, p, &ndr_table_netlogon,
 					      machine_account, DCERPC_AUTH_LEVEL_PRIVACY);
 
 	if (!NT_STATUS_IS_OK(nt_status)) {