[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Wed Nov 28 02:48:04 MST 2012
The branch, v4-0-test has been updated
via 9872a73 docs: Add some binaries to the "SEE ALSO" section
via 7001c0a docs: Fix version in man smb.conf.
via aa1e012 s3-rpc_client: try to use socket_addr if available in rpc_pipe_open_tcp() (bug #9426)
from 92c3c86 WHATSNEW: Update changes since rc5.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 9872a7370ff7d59b6a86f52a92edaf947c8afdf4
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Nov 27 11:46:38 2012 +0100
docs: Add some binaries to the "SEE ALSO" section
of man smb.conf.
Karolin
Reviewed by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 5f0f50c542450b7ede855f8e538ec90450cd10ab)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Wed Nov 28 10:47:39 CET 2012 on sn-devel-104
commit 7001c0a7dfc4778096ad50dd756075078facd9e3
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Nov 27 11:29:26 2012 +0100
docs: Fix version in man smb.conf.
Karolin
Reviewed by: Jeremy Allison <jra at samba.org>
(cherry picked from commit 4a1b16fe57c31ae8125475137088215426997749)
commit aa1e0127657a8a4668fd005ee6a9ba1d96c3d2ec
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 23 18:15:30 2012 +0100
s3-rpc_client: try to use socket_addr if available in rpc_pipe_open_tcp() (bug #9426)
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Mon Nov 26 17:36:20 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/smb.conf.5.xml | 5 ++++-
source3/rpc_client/cli_pipe.c | 23 ++++++++++++++++-------
source3/rpc_client/cli_pipe.h | 1 +
source3/torture/rpc_open_tcp.c | 3 ++-
4 files changed, 23 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index a73382f..71b097b 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -792,7 +792,7 @@ chmod 1770 /usr/local/samba/lib/usershares
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3 of the Samba suite.</para>
+ <para>This man page is correct for version 4 of the Samba suite.</para>
</refsect1>
<refsect1>
@@ -803,6 +803,9 @@ chmod 1770 /usr/local/samba/lib/usershares
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba-tool</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmblookup</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>testparm</refentrytitle>
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index f8c7b24..61e6cce 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2420,6 +2420,7 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx, const char *domain,
* Create an rpc pipe client struct, connecting to a tcp port.
*/
static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
+ const struct sockaddr_storage *ss_addr,
uint16_t port,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_pipe_client **presult)
@@ -2448,9 +2449,13 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
result->max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
- if (!resolve_name(host, &addr, NBT_NAME_SERVER, false)) {
- status = NT_STATUS_NOT_FOUND;
- goto fail;
+ if (ss_addr == NULL) {
+ if (!resolve_name(host, &addr, NBT_NAME_SERVER, false)) {
+ status = NT_STATUS_NOT_FOUND;
+ goto fail;
+ }
+ } else {
+ addr = *ss_addr;
}
status = open_socket_out(&addr, port, 60*1000, &fd);
@@ -2487,6 +2492,7 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host,
* target host.
*/
static NTSTATUS rpc_pipe_get_tcp_port(const char *host,
+ const struct sockaddr_storage *addr,
const struct ndr_syntax_id *abstract_syntax,
uint16_t *pport)
{
@@ -2517,7 +2523,7 @@ static NTSTATUS rpc_pipe_get_tcp_port(const char *host,
}
/* open the connection to the endpoint mapper */
- status = rpc_pipe_open_tcp_port(tmp_ctx, host, 135,
+ status = rpc_pipe_open_tcp_port(tmp_ctx, host, addr, 135,
&ndr_table_epmapper.syntax_id,
&epm_pipe);
@@ -2631,18 +2637,19 @@ done:
* host.
*/
NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host,
+ const struct sockaddr_storage *addr,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_pipe_client **presult)
{
NTSTATUS status;
uint16_t port = 0;
- status = rpc_pipe_get_tcp_port(host, abstract_syntax, &port);
+ status = rpc_pipe_get_tcp_port(host, addr, abstract_syntax, &port);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- return rpc_pipe_open_tcp_port(mem_ctx, host, port,
+ return rpc_pipe_open_tcp_port(mem_ctx, host, addr, port,
abstract_syntax, presult);
}
@@ -2816,7 +2823,9 @@ static NTSTATUS cli_rpc_pipe_open(struct cli_state *cli,
{
switch (transport) {
case NCACN_IP_TCP:
- return rpc_pipe_open_tcp(NULL, smbXcli_conn_remote_name(cli->conn),
+ return rpc_pipe_open_tcp(NULL,
+ smbXcli_conn_remote_name(cli->conn),
+ smbXcli_conn_remote_sockaddr(cli->conn),
interface, presult);
case NCACN_NP:
return rpc_pipe_open_np(cli, interface, presult);
diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h
index 3984cf0..343bd0a 100644
--- a/source3/rpc_client/cli_pipe.h
+++ b/source3/rpc_client/cli_pipe.h
@@ -66,6 +66,7 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx,
NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx,
const char *host,
+ const struct sockaddr_storage *ss_addr,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_pipe_client **presult);
diff --git a/source3/torture/rpc_open_tcp.c b/source3/torture/rpc_open_tcp.c
index 074b186..d29f4cf 100644
--- a/source3/torture/rpc_open_tcp.c
+++ b/source3/torture/rpc_open_tcp.c
@@ -94,7 +94,8 @@ int main(int argc, const char **argv)
return -1;
}
- status = rpc_pipe_open_tcp(mem_ctx, argv[2], &((*table)->syntax_id),
+ status = rpc_pipe_open_tcp(mem_ctx, argv[2], NULL,
+ &((*table)->syntax_id),
&rpc_pipe);
if (!NT_STATUS_IS_OK(status)) {
d_printf("ERROR calling rpc_pipe_open_tcp(): %s\n",
--
Samba Shared Repository
More information about the samba-cvs
mailing list