summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-06-04 04:17:59 +0000
committerAndrew Tridgell <tridge@samba.org>2000-06-04 04:17:59 +0000
commit7ed09de569ac48646f26c6f5e347239bf84c4dcd (patch)
treeff279b7b6e84c1795d6b88ee9b92d7f49f772a04 /source3
parent0090b4ee11a4cd24d21f20c292c44cfdd1b78f85 (diff)
downloadsamba-7ed09de569ac48646f26c6f5e347239bf84c4dcd.tar.gz
samba-7ed09de569ac48646f26c6f5e347239bf84c4dcd.tar.bz2
samba-7ed09de569ac48646f26c6f5e347239bf84c4dcd.zip
some printer parameters are getting corrupted, possibly by the client
possibly by smbd. Reset them so printing at least works while I try to figure out what is going on. (This used to be commit 70476d6767a571460fa375fb1dae884df77ca143)
Diffstat (limited to 'source3')
-rw-r--r--source3/printing/nt_printing.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index fb3afde303..1aa41b856a 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -667,8 +667,8 @@ static uint32 add_a_printer_2(NT_PRINTER_INFO_LEVEL_2 *info)
safe_free(buf);
- DEBUG(8,("packed printer [%s] with form [%s] len=%d\n",
- info->portname, info->devmode->formname, len));
+ DEBUG(8,("packed printer [%s] with printprocessor [%s] parameters=[%s] len=%d\n",
+ info->portname, info->printprocessor, info->parameters, len));
return ret;
}
@@ -1081,8 +1081,18 @@ static uint32 get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharen
nt_printing_getsec(sharename, &info.secdesc_buf);
+ /* the following should not be necessary - why are these values
+ getting corrupted? */
+ fstrcpy(info.printprocessor, "winprint");
+ fstrcpy(info.datatype, "RAW");
+ fstrcpy(info.parameters,"");
+
safe_free(dbuf.dptr);
*info_ptr=memdup(&info, sizeof(info));
+
+ DEBUG(9,("Unpacked printprocessor for [%s] of [%s]\n",
+ sharename, info.printprocessor));
+
return 0;
}