summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2004-08-26 21:32:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:30 -0500
commitf5a2dd73da452bec1fcdaa60a8460b35a43ba3dc (patch)
treea04782bf9d05e07cb87632d3fdf599feeb041d6f
parentdf5ee6a6ba2ebe445c8889625c2ee36eea81fcc8 (diff)
downloadsamba-f5a2dd73da452bec1fcdaa60a8460b35a43ba3dc.tar.gz
samba-f5a2dd73da452bec1fcdaa60a8460b35a43ba3dc.tar.bz2
samba-f5a2dd73da452bec1fcdaa60a8460b35a43ba3dc.zip
r2079: Clear the publish-bit from the attributes-mask when migrating
printer-settings. publishing-info is not handled yet. Guenther (This used to be commit 1d76adb93c98857ed3460db241847e423c021a99)
-rw-r--r--source3/utils/net_rpc_printer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index d43b2ed94c..b414b38a79 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -2095,6 +2095,12 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const
is correctly installed (incl. driver ???) */
init_unistr( &ctr_dst.printers_2->portname, SAMBA_PRINTER_PORT_NAME);
+ /* check if printer is published -> no publish-migration for the moment */
+ if (ctr_enum.printers_2[i].attributes & PRINTER_ATTRIBUTE_PUBLISHED) {
+ printf("printer on originating server was published, ignoring that\n");
+ ctr_dst.printers_2->attributes = PRINTER_ATTRIBUTE_SAMBA;
+ }
+
/* copy devmode (info level 2) */
ctr_dst.printers_2->devmode = talloc_memdup(mem_ctx,
ctr_enum.printers_2[i].devmode, sizeof(DEVICEMODE));