Author: jerry Date: 2007-02-09 20:23:59 +0000 (Fri, 09 Feb 2007) New Revision: 1081
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1081 Log: refresh on patches Modified: trunk/patches/patches-3.0.24/spoolss.diff Changeset: Modified: trunk/patches/patches-3.0.24/spoolss.diff =================================================================== --- trunk/patches/patches-3.0.24/spoolss.diff 2007-02-09 14:01:32 UTC (rev 1080) +++ trunk/patches/patches-3.0.24/spoolss.diff 2007-02-09 20:23:59 UTC (rev 1081) @@ -1,7 +1,7 @@ Index: samba-3.0.24/source/rpc_server/srv_spoolss_nt.c =================================================================== --- samba-3.0.24.orig/source/rpc_server/srv_spoolss_nt.c 2007-02-04 12:59:21.000000000 -0600 -+++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c 2007-02-08 19:33:39.000000000 -0600 ++++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c 2007-02-09 14:22:20.000000000 -0600 @@ -5848,6 +5848,12 @@ goto done; } @@ -34,7 +34,7 @@ Index: samba-3.0.24/source/printing/nt_printing.c =================================================================== --- samba-3.0.24.orig/source/printing/nt_printing.c 2007-02-04 13:09:01.000000000 -0600 -+++ samba-3.0.24/source/printing/nt_printing.c 2007-02-08 19:46:30.000000000 -0600 ++++ samba-3.0.24/source/printing/nt_printing.c 2007-02-09 14:22:20.000000000 -0600 @@ -2984,11 +2984,15 @@ return True; } @@ -168,3 +168,23 @@ } return len; +Index: samba-3.0.24/source/rpc_server/srv_spoolss.c +=================================================================== +--- samba-3.0.24.orig/source/rpc_server/srv_spoolss.c 2006-04-19 21:29:27.000000000 -0500 ++++ samba-3.0.24/source/rpc_server/srv_spoolss.c 2007-02-09 14:22:43.000000000 -0600 +@@ -1477,6 +1477,15 @@ + ZERO_STRUCT(r_u); + + if(!spoolss_io_q_addprinterdriverex("", &q_u, data, 0)) { ++ if (q_u.level != 3 && q_u.level != 6) { ++ /* Clever hack from Martin Zielinski <[EMAIL PROTECTED]> ++ * to allow downgrade from level 8 (Vista). ++ */ ++ DEBUG(3,("api_spoolss_addprinterdriverex: unknown SPOOL_Q_ADDPRINTERDRIVEREX level %u.\n", ++ (unsigned int)q_u.level )); ++ setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG)); ++ return True; ++ } + DEBUG(0,("spoolss_io_q_addprinterdriverex: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVEREX.\n")); + return False; + }