The branch, master has been updated
via baf47ee s3-waf: Move spoolssd into its own subsystem
via 94db858 s3-rpcclient: allow to pass down interface and transport to
epmmap command
from 2959c88 provision: Add support for BIND 9.11.x
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit baf47eebffef6452572a867c28612419e9fa5ab0
Author: Günther Deschner <[email protected]>
Date: Thu Oct 27 15:51:39 2016 +0200
s3-waf: Move spoolssd into its own subsystem
More cleanup will follow later.
Guenther
Pair-Programmed-With: Andreas Schneider <[email protected]>
Signed-off-by: Guenther Deschner <[email protected]>
Signed-off-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Fri Oct 28 22:30:54 CEST 2016 on sn-devel-144
commit 94db858b99ff6b66d18759e8b73e0af82f8b5aba
Author: Günther Deschner <[email protected]>
Date: Wed Oct 26 18:45:29 2016 +0200
s3-rpcclient: allow to pass down interface and transport to epmmap command
Guenther
Signed-off-by: Guenther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/rpcclient/cmd_epmapper.c | 49 ++++++++++++++++++++++++++++++++++++++--
source3/wscript_build | 11 +++++++--
2 files changed, 56 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpcclient/cmd_epmapper.c b/source3/rpcclient/cmd_epmapper.c
index 52144c3..7753df2 100644
--- a/source3/rpcclient/cmd_epmapper.c
+++ b/source3/rpcclient/cmd_epmapper.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "rpcclient.h"
#include "../librpc/gen_ndr/ndr_epmapper_c.h"
-#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/ndr/ndr_table.h"
static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
TALLOC_CTX *mem_ctx,
@@ -38,8 +38,46 @@ static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
NTSTATUS status;
uint32_t result;
uint32_t i;
+ const struct ndr_interface_list *l;
+ const char *interface_name = "lsarpc";
+ enum dcerpc_transport_t transport = NCACN_NP;
+ bool ok = false;
+
+ if (argc > 3) {
+ d_fprintf(stderr, "Usage: %s [interface_name] [transport]\n",
+ argv[0]);
+ return NT_STATUS_OK;
+ }
+
+ if (argc >= 2) {
+ interface_name = argv[1];
+ }
- abstract_syntax = ndr_table_lsarpc.syntax_id;
+ for (l = ndr_table_list(); l != NULL; l = l->next) {
+
+ ok = strequal(interface_name, l->table->name);
+ if (ok) {
+ abstract_syntax = l->table->syntax_id;
+ break;
+ }
+ }
+
+ if (!ok) {
+ d_fprintf(stderr, "unknown interface: %s\n",
+ interface_name);
+ status = NT_STATUS_UNSUCCESSFUL;
+ goto done;
+ }
+
+ if (argc >= 3) {
+ transport = dcerpc_transport_by_name(argv[2]);
+ if (transport == NCA_UNKNOWN) {
+ d_fprintf(stderr, "unknown transport: %s\n",
+ argv[2]);
+ status = NT_STATUS_UNSUCCESSFUL;
+ goto done;
+ }
+ }
/* 127.0.0.1[0] => correct? needed? */
status = dcerpc_parse_binding(tmp_ctx, "ncacn_np:127.0.0.1[0]",
@@ -50,6 +88,13 @@ static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
goto done;
}
+ status = dcerpc_binding_set_transport(map_binding, transport);
+ if (!NT_STATUS_IS_OK(status)) {
+ d_fprintf(stderr, "dcerpc_binding_set_transport returned %s\n",
+ nt_errstr(status));
+ goto done;
+ }
+
status = dcerpc_binding_set_abstract_syntax(map_binding,
&abstract_syntax);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/wscript_build b/source3/wscript_build
index ee5337a..22e1a62 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -563,7 +563,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
smbd/service.c
smbd/error.c
printing/printspoolss.c
- printing/spoolssd.c
lib/sessionid_tdb.c
lib/conn_tdb.c
smbd/fake_file.c
@@ -684,7 +683,7 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
printing/nt_printing_migrate_internal.c
printing/nt_printing_ads.c
printing/queue_process.c''',
- deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate')
+ deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate
SPOOLSSD')
bld.SAMBA3_LIBRARY('printing_migrate',
source='printing/nt_printing_migrate.c
rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
@@ -855,6 +854,13 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
bld.SAMBA3_SUBSYSTEM('LIBLSA',
source='lib/lsa.c')
+bld.SAMBA3_SUBSYSTEM('SPOOLSSD',
+ source='printing/spoolssd.c',
+ deps='''
+ samba-util
+ RPC_SOCK_HELPER
+ ''')
+
########################## BINARIES #################################
bld.SAMBA3_BINARY('smbd/smbd',
@@ -865,6 +871,7 @@ bld.SAMBA3_BINARY('smbd/smbd',
LSASD
FSSD
MDSSD
+ SPOOLSSD
''',
install_path='${SBINDIR}')
--
Samba Shared Repository
