The branch, master has been updated
via 4234cbb s3-rpc_server: Fix inteface typo.
via ab26e84 tstream: Make socketpair nonblocking
from 2f2cdaf debug: Fix default log levels
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4234cbb694a9eee1b7752566e50bbf7ffca75685
Author: Günther Deschner <[email protected]>
Date: Wed Jun 3 13:33:00 2015 +0200
s3-rpc_server: Fix inteface typo.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Ira Cooper <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Thu Jun 4 03:51:29 CEST 2015 on sn-devel-104
commit ab26e84da15c636ecd772afcba740b307e1a5a79
Author: Volker Lendecke <[email protected]>
Date: Wed Jun 3 13:41:24 2015 +0000
tstream: Make socketpair nonblocking
When we have a large RPC reply, we can't block in the RPC server.
Test: Do rpcclient netshareenumall with a thousand shares defined
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
libcli/named_pipe_auth/npa_tstream.c | 25 ++++++++++++++++++++-----
source3/librpc/rpc/dcerpc_ep.h | 6 +++---
source3/printing/spoolssd.c | 8 ++++----
source3/rpc_server/epmapper/srv_epmapper.c | 2 +-
source3/rpc_server/epmd.c | 2 +-
source3/rpc_server/fssd.c | 2 +-
source3/rpc_server/lsasd.c | 14 +++++++-------
7 files changed, 37 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/named_pipe_auth/npa_tstream.c
b/libcli/named_pipe_auth/npa_tstream.c
index 3d3f55e..3539202 100644
--- a/libcli/named_pipe_auth/npa_tstream.c
+++ b/libcli/named_pipe_auth/npa_tstream.c
@@ -1468,17 +1468,23 @@ int _tstream_npa_socketpair(uint16_t file_type,
fd1 = fds[0];
fd2 = fds[1];
+ rc = set_blocking(fd1, false);
+ if (rc == -1) {
+ goto close_fail;
+ }
+
+ rc = set_blocking(fd2, false);
+ if (rc == -1) {
+ goto close_fail;
+ }
+
rc = _tstream_npa_existing_socket(mem_ctx1,
fd1,
file_type,
&stream1,
location);
if (rc == -1) {
- int sys_errno = errno;
- close(fd1);
- close(fd2);
- errno = sys_errno;
- return -1;
+ goto close_fail;
}
rc = _tstream_npa_existing_socket(mem_ctx2,
@@ -1498,4 +1504,13 @@ int _tstream_npa_socketpair(uint16_t file_type,
*pstream2 = stream2;
return 0;
+
+close_fail:
+ {
+ int sys_errno = errno;
+ close(fd1);
+ close(fd2);
+ errno = sys_errno;
+ return -1;
+ }
}
diff --git a/source3/librpc/rpc/dcerpc_ep.h b/source3/librpc/rpc/dcerpc_ep.h
index 7d1397b..6cd4683 100644
--- a/source3/librpc/rpc/dcerpc_ep.h
+++ b/source3/librpc/rpc/dcerpc_ep.h
@@ -51,9 +51,9 @@ NTSTATUS dcerpc_binding_vector_add_np_default(const struct
ndr_interface_table *
*
* @param[in] iface The rpc interface to add.
*
- * @param[in] bvec The binding vector to add the intface, host and port.
+ * @param[in] bvec The binding vector to add the interface, host and port.
*
- * @param[in] host The ip address of the network inteface bound.
+ * @param[in] host The ip address of the network interface bound.
*
* @param[in] port The port bound.
*
@@ -69,7 +69,7 @@ NTSTATUS dcerpc_binding_vector_add_port(const struct
ndr_interface_table *iface,
*
* @param[in] iface The rpc interface to add.
*
- * @param[in] bvec The binding vector to add the intface, host and port.
+ * @param[in] bvec The binding vector to add the interface, host and port.
*
* @param[in] name The name of the unix socket.
*
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 3007898..9f533b3 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -315,14 +315,14 @@ static bool spoolss_child_init(struct tevent_context
*ev_ctx,
status = rpc_winreg_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register winreg rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register winreg rpc interface! (%s)\n",
nt_errstr(status)));
return false;
}
status = rpc_spoolss_init(&spoolss_cb);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register spoolss rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register spoolss rpc interface! (%s)\n",
nt_errstr(status)));
return false;
}
@@ -742,14 +742,14 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
status = rpc_winreg_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register winreg rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register winreg rpc interface! (%s)\n",
nt_errstr(status)));
exit(1);
}
status = rpc_spoolss_init(&spoolss_cb);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register spoolss rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register spoolss rpc interface! (%s)\n",
nt_errstr(status)));
exit(1);
}
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c
b/source3/rpc_server/epmapper/srv_epmapper.c
index 129ce52..24f7d9c 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -774,7 +774,7 @@ error_status_t _epm_Lookup(struct pipes_struct *p,
if (match) {
if (r->in.inquiry_type == RPC_C_EP_MATCH_BY_IF ||
r->in.inquiry_type == RPC_C_EP_MATCH_BY_OBJ) {
- /* Check inteface version */
+ /* Check interface version */
match = false;
switch (r->in.vers_option) {
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index dad67ae..f87edd8 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -190,7 +190,7 @@ void start_epmd(struct tevent_context *ev_ctx,
status = rpc_epmapper_init(&epmapper_cb);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register epmd rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register epmd rpc interface! (%s)\n",
nt_errstr(status)));
exit(1);
}
diff --git a/source3/rpc_server/fssd.c b/source3/rpc_server/fssd.c
index 0f8b02e..81c65a6 100644
--- a/source3/rpc_server/fssd.c
+++ b/source3/rpc_server/fssd.c
@@ -197,7 +197,7 @@ void start_fssd(struct tevent_context *ev_ctx,
status = rpc_FileServerVssAgent_init(&fss_cb);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register fssd rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register fssd rpc interface! (%s)\n",
nt_errstr(status)));
exit(1);
}
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index d287bff..6fd0817 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -278,21 +278,21 @@ static bool lsasd_child_init(struct tevent_context
*ev_ctx,
status = rpc_lsarpc_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register lsarpc rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register lsarpc rpc interface! (%s)\n",
nt_errstr(status)));
return false;
}
status = rpc_samr_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register samr rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register samr rpc interface! (%s)\n",
nt_errstr(status)));
return false;
}
status = rpc_netlogon_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register netlogon rpc inteface! (%s)\n",
+ DEBUG(0, ("Failed to register netlogon rpc interface! (%s)\n",
nt_errstr(status)));
return false;
}
@@ -446,7 +446,7 @@ static void lsasd_handle_client(struct tevent_req *req)
(int)(data->pf->pid)));
if (tsocket_address_is_inet(srv_addr, "ip")) {
- DEBUG(3, ("Got a tcpip client connection from %s on inteface
%s\n",
+ DEBUG(3, ("Got a tcpip client connection from %s on interface
%s\n",
tsocket_address_string(cli_addr, tmp_ctx),
tsocket_address_string(srv_addr, tmp_ctx)));
@@ -917,21 +917,21 @@ void start_lsasd(struct tevent_context *ev_ctx,
status = rpc_lsarpc_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register lsarpc rpc inteface in lsasd!
(%s)\n",
+ DEBUG(0, ("Failed to register lsarpc rpc interface in lsasd!
(%s)\n",
nt_errstr(status)));
exit(1);
}
status = rpc_samr_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register samr rpc inteface in lsasd!
(%s)\n",
+ DEBUG(0, ("Failed to register samr rpc interface in lsasd!
(%s)\n",
nt_errstr(status)));
exit(1);
}
status = rpc_netlogon_init(NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("Failed to register netlogon rpc inteface in lsasd!
(%s)\n",
+ DEBUG(0, ("Failed to register netlogon rpc interface in lsasd!
(%s)\n",
nt_errstr(status)));
exit(1);
}
--
Samba Shared Repository
