The branch, master has been updated
via 380938b00fb nt_printing_ads: add missing printShareName attribute
when publishing printers
via 787d7756b99 cli_winreg_spoolss: handle also printer sharename
via 7651c026819 srv_spoolss_nt.c: fix wrong value in debug message
from ed625d66943 tests: Disable kerberos for weak crypto test
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 380938b00fb9fdb5b100e77000a059199695f43a
Author: Björn Jacke <b...@sernet.de>
Date: Mon Sep 7 23:53:21 2020 +0200
nt_printing_ads: add missing printShareName attribute when publishing
printers
Without printShareName attribute in LDAP, Windows doesn't list the pinters
at all.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9771
Signed-off-by: Bjoern Jacke <bja...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Sep 18 01:58:22 UTC 2020 on sn-devel-184
commit 787d7756b99f182cc91c4c4215b8a5657a6d25d7
Author: Björn Jacke <b...@sernet.de>
Date: Mon Sep 7 20:09:56 2020 +0200
cli_winreg_spoolss: handle also printer sharename
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9771
Signed-off-by: Bjoern Jacke <bja...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 7651c0268199010b3950c200a7ee2bba9e4cb442
Author: Björn Jacke <b...@sernet.de>
Date: Mon Sep 7 23:45:06 2020 +0200
srv_spoolss_nt.c: fix wrong value in debug message
Signed-off-by: Bjoern Jacke <bja...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/printing/nt_printing_ads.c | 1 +
source3/rpc_client/cli_winreg_spoolss.c | 13 +++++++++++++
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/nt_printing_ads.c
b/source3/printing/nt_printing_ads.c
index 478d1231b00..b3176f88b15 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -345,6 +345,7 @@ static WERROR nt_printer_info_to_mods(TALLOC_CTX *ctx,
char *info_str;
ads_mod_str(ctx, mods, SPOOL_REG_PRINTERNAME, info2->sharename);
+ ads_mod_str(ctx, mods, SPOOL_REG_PRINTSHARENAME, info2->sharename);
ads_mod_str(ctx, mods, SPOOL_REG_SHORTSERVERNAME, lp_netbios_name());
ads_mod_str(ctx, mods, SPOOL_REG_SERVERNAME, get_mydnsfullname());
diff --git a/source3/rpc_client/cli_winreg_spoolss.c
b/source3/rpc_client/cli_winreg_spoolss.c
index 7a0817a176a..3b66e20676d 100644
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -857,6 +857,19 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
goto done;
}
+ status = dcerpc_winreg_set_sz(tmp_ctx,
+ winreg_handle,
+ &key_hnd,
+ SPOOL_REG_PRINTSHARENAME,
+ sharename,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ result = ntstatus_to_werror(status);
+ }
+ if (!W_ERROR_IS_OK(result)) {
+ goto done;
+ }
+
status = dcerpc_winreg_set_sz(tmp_ctx,
winreg_handle,
&key_hnd,
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index d746067d250..055ff172526 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -6680,7 +6680,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx,
buffer.data,
buffer.length);
if (!W_ERROR_IS_OK(result)) {
- DEBUG(0, ("Failed to set %s\n",
SPOOL_REG_PRINTSHARENAME));
+ DBG_ERR("Failed to set %s\n", SPOOL_REG_PRINTERNAME);
goto done;
}
--
Samba Shared Repository
