merge from 2.2

(This used to be commit 9e96cbe24149c8d0ed4f3a1f1d5ea736ba5dca56)

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index de12e63847273964bcb9cdfa2532bd022972a7cd..97f8ad360c5546696203264928f25a1bc664f2c8 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1785,8 +1785,8 @@ uint32 get_a_printer_driver_9x_compatible(pstring line, fstring model)
        DEBUGADD(10,("info3->configfile      [%s]\n", info3->configfile));
 
        /*pstrcat(line, info3->name);             pstrcat(line, ":");*/
-       trim_string(info3->configfile, "\\print$\\WIN40\\0\\", 0);
-       pstrcat(line, info3->configfile);
+       trim_string(info3->driverpath, "\\print$\\WIN40\\0\\", 0);
+       pstrcat(line, info3->driverpath);
        pstrcat(line, ":");
        trim_string(info3->datafile, "\\print$\\WIN40\\0\\", 0);
        pstrcat(line, info3->datafile);