summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-06-16 16:12:07 +0200
committerAndrew Bartlett <abartlet@samba.org>2011-07-04 18:28:43 +1000
commit2bcbeea05ec4b831d587f83795029dfbe5476c79 (patch)
treef719c55c71c98e1d7b92b8ff174a71c1c8495ada
parentaee04ef3306da989fe50c192425d4de755fb9a7e (diff)
downloadsamba-2bcbeea05ec4b831d587f83795029dfbe5476c79.tar.gz
samba-2bcbeea05ec4b831d587f83795029dfbe5476c79.tar.bz2
samba-2bcbeea05ec4b831d587f83795029dfbe5476c79.zip
s3-rpc_server: Remove client_id and server_id from pipes struct.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/include/ntdomain.h2
-rw-r--r--source3/rpc_server/rpc_ncacn_np.c17
-rw-r--r--source3/rpc_server/rpc_server.c43
3 files changed, 0 insertions, 62 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 814dfaf363..46579b7250 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -110,8 +110,6 @@ struct tsocket_address;
struct pipes_struct {
struct pipes_struct *next, *prev;
- struct client_address *client_id;
- struct client_address *server_id;
const struct tsocket_address *local_address;
const struct tsocket_address *remote_address;
diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index 9bbc5dfddb..b2a22295a6 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -170,23 +170,6 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
return false;
}
- p->client_id = talloc_zero(p, struct client_address);
- if (p->client_id == NULL) {
- return false;
- }
-
- if (tsocket_address_is_inet(p->remote_address, "ip")) {
- p->client_id->name = tsocket_address_inet_addr_string(p->remote_address,
- p->client_id);
- } else {
- p->client_id->name = talloc_strdup(p->client_id, "");
- }
- if (p->client_id->name == NULL) {
- return false;
- }
- strlcpy(p->client_id->addr,
- p->client_id->name, sizeof(p->client_id->addr));
-
p->endian = RPC_LITTLE_ENDIAN;
p->transport = NCALRPC;
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 6852f2e662..a54ade4875 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -174,27 +174,6 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
return -1;
}
- p->client_id = talloc_zero(p, struct client_address);
- if (p->client_id == NULL) {
- TALLOC_FREE(p);
- *perrno = ENOMEM;
- return -1;
- }
-
- if (tsocket_address_is_inet(p->remote_address, "ip")) {
- p->client_id->name = tsocket_address_inet_addr_string(p->remote_address,
- p->client_id);
- } else {
- p->client_id->name = talloc_strdup(p->client_id, "");
- }
- if (p->client_id->name == NULL) {
- TALLOC_FREE(p);
- *perrno = ENOMEM;
- return -1;
- }
- strlcpy(p->client_id->addr,
- p->client_id->name, sizeof(p->client_id->addr));
-
if (local_address != NULL) {
p->local_address = tsocket_address_copy(local_address, p);
if (p->local_address == NULL) {
@@ -202,28 +181,6 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
*perrno = ENOMEM;
return -1;
}
-
- p->server_id = talloc_zero(p, struct client_address);
- if (p->server_id == NULL) {
- TALLOC_FREE(p);
- *perrno = ENOMEM;
- return -1;
- }
- if (tsocket_address_is_inet(p->local_address, "ip")) {
- p->server_id->name = tsocket_address_inet_addr_string(p->local_address,
- p->server_id);
- } else {
- p->server_id->name = talloc_strdup(p->server_id, "");
- }
- if (p->server_id->name == NULL) {
- TALLOC_FREE(p);
- *perrno = ENOMEM;
- return -1;
- }
-
- strlcpy(p->server_id->addr,
- p->server_id->name,
- sizeof(p->server_id->addr));
}
talloc_set_destructor(p, close_internal_rpc_pipe_hnd);