The branch, master has been updated
via 807628e s3-rpc: remove unused source3/librpc/rpc/rpc_common.c
via b73e2d9 s3-rpc: use dcerpc_default_transport_endpoint function.
via 40ee3d8 librpc: add dcerpc_default_transport_endpoint() function.
via 3135533 s3-rpc: use ndr_interface_name() instead of
get_pipe_name_from_syntax() in DEBUG.
via a94e278 s3-rpc: use table->name directly in DEBUG contexts.
via 21200b1 librpc/ndr: make sure ndr_table_list() always calls
ndr_init_table() first.
via 88c1dbf librpc/ndr: call ndr_table_list() from all ndr_X functions.
from ea3db09 libcli: continue to read from the socket even if the size
is 0
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 807628ecac445999e75ec9ea1abdc5f2fde356d6
Author: Günther Deschner <[email protected]>
Date: Wed Aug 7 17:43:08 2013 +0200
s3-rpc: remove unused source3/librpc/rpc/rpc_common.c
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Fri Sep 20 14:57:06 CEST 2013 on sn-devel-104
commit b73e2d927b2221cb3fde8776789c8ca085cf2b8f
Author: Günther Deschner <[email protected]>
Date: Wed Sep 18 10:59:14 2013 +0200
s3-rpc: use dcerpc_default_transport_endpoint function.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit 40ee3d8a5f7439b90f1ebf5e40535fad51038fe6
Author: Günther Deschner <[email protected]>
Date: Thu Aug 8 17:33:29 2013 +0200
librpc: add dcerpc_default_transport_endpoint() function.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit 3135533710b2a1b64aaf6b10d30b86f3c004657d
Author: Günther Deschner <[email protected]>
Date: Wed Sep 18 10:58:16 2013 +0200
s3-rpc: use ndr_interface_name() instead of get_pipe_name_from_syntax() in
DEBUG.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit a94e278883c58b35d383753e86135ff6a1d14ec7
Author: Günther Deschner <[email protected]>
Date: Thu Aug 8 17:40:22 2013 +0200
s3-rpc: use table->name directly in DEBUG contexts.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit 21200b12dc14673f9a610c5798635b6052370dbe
Author: Günther Deschner <[email protected]>
Date: Thu Aug 8 17:34:56 2013 +0200
librpc/ndr: make sure ndr_table_list() always calls ndr_init_table() first.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
commit 88c1dbf722889a2d7379cdcbac1ce9b140a42356
Author: Günther Deschner <[email protected]>
Date: Mon Aug 12 17:22:15 2013 +0200
librpc/ndr: call ndr_table_list() from all ndr_X functions.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
librpc/ndr/ndr_table.c | 7 +-
librpc/rpc/dcerpc_util.c | 55 +++++++++
librpc/rpc/rpc_common.h | 3 +
source3/lib/netapi/cm.c | 2 +-
source3/librpc/rpc/dcerpc.h | 8 --
source3/librpc/rpc/rpc_common.c | 209 ---------------------------------
source3/rpc_client/cli_pipe.c | 7 +-
source3/rpc_client/rpc_transport_np.c | 3 +-
source3/rpc_server/rpc_handles.c | 15 ++-
source3/rpc_server/rpc_ncacn_np.c | 12 ++-
source3/rpc_server/srv_pipe.c | 50 ++++++---
source3/rpc_server/srv_pipe_hnd.c | 16 ++-
source3/wscript_build | 4 +-
13 files changed, 135 insertions(+), 256 deletions(-)
delete mode 100644 source3/librpc/rpc/rpc_common.c
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_table.c b/librpc/ndr/ndr_table.c
index 7ca0417..f73b9fc 100644
--- a/librpc/ndr/ndr_table.c
+++ b/librpc/ndr/ndr_table.c
@@ -73,7 +73,7 @@ const char *ndr_interface_name(const struct GUID *uuid,
uint32_t if_version)
int ndr_interface_num_calls(const struct GUID *uuid, uint32_t if_version)
{
const struct ndr_interface_list *l;
- for (l=ndr_interfaces;l;l=l->next){
+ for (l=ndr_table_list();l;l=l->next){
if (GUID_equal(&l->table->syntax_id.uuid, uuid) &&
l->table->syntax_id.if_version == if_version) {
return l->table->num_calls;
@@ -89,7 +89,7 @@ int ndr_interface_num_calls(const struct GUID *uuid, uint32_t
if_version)
const struct ndr_interface_table *ndr_table_by_name(const char *name)
{
const struct ndr_interface_list *l;
- for (l=ndr_interfaces;l;l=l->next) {
+ for (l=ndr_table_list();l;l=l->next) {
if (strcasecmp(l->table->name, name) == 0) {
return l->table;
}
@@ -103,7 +103,7 @@ const struct ndr_interface_table *ndr_table_by_name(const
char *name)
const struct ndr_interface_table *ndr_table_by_uuid(const struct GUID *uuid)
{
const struct ndr_interface_list *l;
- for (l=ndr_interfaces;l;l=l->next) {
+ for (l=ndr_table_list();l;l=l->next) {
if (GUID_equal(&l->table->syntax_id.uuid, uuid)) {
return l->table;
}
@@ -116,6 +116,7 @@ const struct ndr_interface_table *ndr_table_by_uuid(const
struct GUID *uuid)
*/
const struct ndr_interface_list *ndr_table_list(void)
{
+ ndr_table_init();
return ndr_interfaces;
}
diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
index de292c8..980b070 100644
--- a/librpc/rpc/dcerpc_util.c
+++ b/librpc/rpc/dcerpc_util.c
@@ -318,3 +318,58 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req
*req,
tevent_req_received(req);
return NT_STATUS_OK;
}
+
+const char *dcerpc_default_transport_endpoint(TALLOC_CTX *mem_ctx,
+ enum dcerpc_transport_t transport,
+ const struct ndr_interface_table
*table)
+{
+ NTSTATUS status;
+ const char *p = NULL;
+ const char *endpoint = NULL;
+ int i;
+ struct dcerpc_binding *default_binding = NULL;
+ TALLOC_CTX *frame = talloc_stackframe();
+
+ /* Find one of the default pipes for this interface */
+
+ for (i = 0; i < table->endpoints->count; i++) {
+
+ status = dcerpc_parse_binding(frame, table->endpoints->names[i],
+ &default_binding);
+ if (NT_STATUS_IS_OK(status)) {
+ if (transport == NCA_UNKNOWN &&
+ default_binding->endpoint != NULL) {
+ p = default_binding->endpoint;
+ break;
+ }
+ if (default_binding->transport == transport &&
+ default_binding->endpoint != NULL) {
+ p = default_binding->endpoint;
+ break;
+ }
+ }
+ }
+
+ if (i == table->endpoints->count || p == NULL) {
+ goto done;
+ }
+
+ /*
+ * extract the pipe name without \\pipe from for example
+ * ncacn_np:[\\pipe\\epmapper]
+ */
+ if (default_binding->transport == NCACN_NP) {
+ if (strncasecmp(p, "\\pipe\\", 6) == 0) {
+ p += 6;
+ }
+ if (strncmp(p, "\\", 1) == 0) {
+ p += 1;
+ }
+ }
+
+ endpoint = talloc_strdup(mem_ctx, p);
+
+ done:
+ talloc_free(frame);
+ return endpoint;
+}
diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
index e2b3755..d2816f5 100644
--- a/librpc/rpc/rpc_common.h
+++ b/librpc/rpc/rpc_common.h
@@ -143,6 +143,9 @@ void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
+const char *dcerpc_default_transport_endpoint(TALLOC_CTX *mem_ctx,
+ enum dcerpc_transport_t transport,
+ const struct ndr_interface_table
*table);
/**
* @brief Pull a dcerpc_auth structure, taking account of any auth
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 1cfdccf..bb5d6b2 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -254,7 +254,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
status = pipe_cm_open(ctx, ipc, table, &result);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",
- get_pipe_name_from_syntax(talloc_tos(),
&table->syntax_id),
+ table->name,
get_friendly_nt_error_msg(status));
return WERR_DEST_NOT_FOUND;
}
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 38d59cd..b18b7ba 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -85,12 +85,4 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
DATA_BLOB *raw_pkt,
size_t *pad_len);
-/* The following definitions come from librpc/rpc/rpc_common.c */
-
-bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
-const struct ndr_interface_table *get_iface_from_syntax(
- const struct ndr_syntax_id *syntax);
-const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
- const struct ndr_syntax_id *syntax);
-
#endif /* __S3_DCERPC_H__ */
diff --git a/source3/librpc/rpc/rpc_common.c b/source3/librpc/rpc/rpc_common.c
deleted file mode 100644
index 1219b2d..0000000
--- a/source3/librpc/rpc/rpc_common.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * RPC Pipe client / server routines
- * Largely rewritten by 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"
-#include "librpc/rpc/dcerpc.h"
-#include "../librpc/gen_ndr/ndr_lsa.h"
-#include "../librpc/gen_ndr/ndr_dssetup.h"
-#include "../librpc/gen_ndr/ndr_samr.h"
-#include "../librpc/gen_ndr/ndr_netlogon.h"
-#include "../librpc/gen_ndr/ndr_srvsvc.h"
-#include "../librpc/gen_ndr/ndr_wkssvc.h"
-#include "../librpc/gen_ndr/ndr_winreg.h"
-#include "../librpc/gen_ndr/ndr_spoolss.h"
-#include "../librpc/gen_ndr/ndr_dfs.h"
-#include "../librpc/gen_ndr/ndr_echo.h"
-#include "../librpc/gen_ndr/ndr_initshutdown.h"
-#include "../librpc/gen_ndr/ndr_svcctl.h"
-#include "../librpc/gen_ndr/ndr_eventlog.h"
-#include "../librpc/gen_ndr/ndr_ntsvcs.h"
-#include "../librpc/gen_ndr/ndr_epmapper.h"
-#include "../librpc/gen_ndr/ndr_drsuapi.h"
-#include "../librpc/gen_ndr/ndr_fsrvp.h"
-
-static const char *get_pipe_name_from_iface(
- TALLOC_CTX *mem_ctx, const struct ndr_interface_table *interface)
-{
- int i;
- const struct ndr_interface_string_array *ep = interface->endpoints;
- char *p;
-
- for (i=0; i<ep->count; i++) {
- if (strncmp(ep->names[i], "ncacn_np:[\\pipe\\", 16) == 0) {
- break;
- }
- }
- if (i == ep->count) {
- return NULL;
- }
-
- /*
- * extract the pipe name without \\pipe from for example
- * ncacn_np:[\\pipe\\epmapper]
- */
- p = strchr(ep->names[i]+15, ']');
- if (p == NULL) {
- return "PIPE";
- }
- return talloc_strndup(mem_ctx, ep->names[i]+15, p - ep->names[i] - 15);
-}
-
-static const struct ndr_interface_table **interfaces;
-
-bool smb_register_ndr_interface(const struct ndr_interface_table *interface)
-{
- int num_interfaces = talloc_array_length(interfaces);
- const struct ndr_interface_table **tmp;
- int i;
-
- for (i=0; i<num_interfaces; i++) {
- if (ndr_syntax_id_equal(&interfaces[i]->syntax_id,
- &interface->syntax_id)) {
- return true;
- }
- }
-
- tmp = talloc_realloc(NULL, interfaces,
- const struct ndr_interface_table *,
- num_interfaces + 1);
- if (tmp == NULL) {
- DEBUG(1, ("smb_register_ndr_interface: talloc failed\n"));
- return false;
- }
- interfaces = tmp;
- interfaces[num_interfaces] = interface;
- return true;
-}
-
-static bool initialize_interfaces(void)
-{
- if (!smb_register_ndr_interface(&ndr_table_lsarpc)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_dssetup)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_samr)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_srvsvc)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_wkssvc)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_winreg)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_spoolss)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_netdfs)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_rpcecho)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_initshutdown)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_svcctl)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_eventlog)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_ntsvcs)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_epmapper)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_drsuapi)) {
- return false;
- }
- if (!smb_register_ndr_interface(&ndr_table_FileServerVssAgent)) {
- return false;
- }
- return true;
-}
-
-const struct ndr_interface_table *get_iface_from_syntax(
- const struct ndr_syntax_id *syntax)
-{
- int num_interfaces;
- int i;
-
- if (interfaces == NULL) {
- if (!initialize_interfaces()) {
- return NULL;
- }
- }
- num_interfaces = talloc_array_length(interfaces);
-
- for (i=0; i<num_interfaces; i++) {
- if (ndr_syntax_id_equal(&interfaces[i]->syntax_id, syntax)) {
- return interfaces[i];
- }
- }
-
- return NULL;
-}
-
-/****************************************************************************
- Return the pipe name from the interface.
- ****************************************************************************/
-
-const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
- const struct ndr_syntax_id *syntax)
-{
- const struct ndr_interface_table *interface;
- char *guid_str;
- const char *result;
-
- interface = get_iface_from_syntax(syntax);
- if (interface != NULL) {
- result = get_pipe_name_from_iface(mem_ctx, interface);
- if (result != NULL) {
- return result;
- }
- }
-
- /*
- * Here we should ask \\epmapper, but for now our code is only
- * interested in the known pipes mentioned in pipe_names[]
- */
-
- guid_str = GUID_string(talloc_tos(), &syntax->uuid);
- if (guid_str == NULL) {
- return NULL;
- }
- result = talloc_asprintf(mem_ctx, "Interface %s.%d", guid_str,
- (int)syntax->if_version);
- TALLOC_FREE(guid_str);
-
- if (result == NULL) {
- return "PIPE";
- }
- return result;
-}
-
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 1376973..e7e8610 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2664,8 +2664,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct
cli_state *cli,
}
DEBUG(lvl, ("cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe "
"%s failed with error %s\n",
- get_pipe_name_from_syntax(talloc_tos(),
- &table->syntax_id),
+ table->name,
nt_errstr(status) ));
TALLOC_FREE(result);
return status;
@@ -2673,7 +2672,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct
cli_state *cli,
DEBUG(10,("cli_rpc_pipe_open_noauth: opened pipe %s to machine "
"%s and bound anonymously.\n",
- get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id),
+ table->name,
result->desthost));
*presult = result;
@@ -2918,7 +2917,7 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct
cli_state *cli,
done:
DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to
machine %s "
"for domain %s and bound using schannel.\n",
- get_pipe_name_from_syntax(talloc_tos(), &table->syntax_id),
+ table->name,
rpccli->desthost, domain));
*_rpccli = rpccli;
diff --git a/source3/rpc_client/rpc_transport_np.c
b/source3/rpc_client/rpc_transport_np.c
index 804db58..9617494 100644
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -21,6 +21,7 @@
#include "../lib/util/tevent_ntstatus.h"
#include "rpc_client/rpc_transport.h"
#include "libsmb/cli_np_tstream.h"
+#include "librpc/ndr/ndr_table.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_CLI
@@ -47,7 +48,7 @@ struct tevent_req *rpc_transport_np_init_send(TALLOC_CTX
*mem_ctx,
return NULL;
}
- pipe_name = get_pipe_name_from_syntax(state, &table->syntax_id);
+ pipe_name = dcerpc_default_transport_endpoint(mem_ctx, NCACN_NP, table);
if (tevent_req_nomem(pipe_name, req)) {
return tevent_req_post(req, ev);
}
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index 70c3919..409299a 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -27,6 +27,7 @@
#include "rpc_server/rpc_pipes.h"
#include "../libcli/security/security.h"
#include "lib/tsocket/tsocket.h"
+#include "librpc/ndr/ndr_table.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
@@ -218,7 +219,8 @@ bool init_pipe_handles(struct pipes_struct *p, const struct
ndr_syntax_id *synta
DEBUG(10,("init_pipe_handle_list: created handle list for "
"pipe %s\n",
- get_pipe_name_from_syntax(talloc_tos(), syntax)));
+ ndr_interface_name(&syntax->uuid,
+ syntax->if_version)));
}
/*
@@ -235,7 +237,7 @@ bool init_pipe_handles(struct pipes_struct *p, const struct
ndr_syntax_id *synta
DEBUG(10,("init_pipe_handle_list: pipe_handles ref count = %lu for "
"pipe %s\n", (unsigned long)p->pipe_handles->pipe_ref_count,
- get_pipe_name_from_syntax(talloc_tos(), syntax)));
+ ndr_interface_name(&syntax->uuid, syntax->if_version)));
return True;
}
@@ -412,8 +414,8 @@ void close_policy_by_pipe(struct pipes_struct *p)
TALLOC_FREE(p->pipe_handles);
DEBUG(10,("Deleted handle list for RPC connection %s\n",
- get_pipe_name_from_syntax(talloc_tos(),
- &p->contexts->syntax)));
+ ndr_interface_name(&p->contexts->syntax.uuid,
+ p->contexts->syntax.if_version)));
}
}
@@ -456,8 +458,9 @@ void *_policy_handle_create(struct pipes_struct *p, struct
policy_handle *hnd,
if (p->pipe_handles->count > MAX_OPEN_POLS) {
DEBUG(0, ("ERROR: Too many handles (%d) for RPC connection
%s\n",
(int) p->pipe_handles->count,
- get_pipe_name_from_syntax(talloc_tos(),
- &p->contexts->syntax)));
+ ndr_interface_name(&p->contexts->syntax.uuid,
+ p->contexts->syntax.if_version)));
+
*pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
return NULL;
}
diff --git a/source3/rpc_server/rpc_ncacn_np.c
b/source3/rpc_server/rpc_ncacn_np.c
index 60f72a5..9c1599e 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -36,6 +36,7 @@
#include "../lib/util/tevent_ntstatus.h"
#include "rpc_contexts.h"
#include "rpc_server/rpc_config.h"
+#include "librpc/ndr/ndr_table.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_SRV
@@ -54,8 +55,15 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX
*mem_ctx,
struct pipe_rpc_fns *context_fns;
const char *pipe_name;
int ret;
+ const struct ndr_interface_table *table;
- pipe_name = get_pipe_name_from_syntax(talloc_tos(), syntax);
+ table = ndr_table_by_uuid(&syntax->uuid);
+ if (table == NULL) {
+ DEBUG(0,("unknown interface\n"));
+ return NULL;
+ }
+
+ pipe_name = dcerpc_default_transport_endpoint(mem_ctx, NCACN_NP, table);
DEBUG(4,("Create pipe requested %s\n", pipe_name));
@@ -783,7 +791,7 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
--
Samba Shared Repository
