svn commit: samba-web r1083 - in trunk/patches/patches-3.0.24: .

[jerry at samba.org]

Author: jerry
Date: 2007-02-15 17:04:18 +0000 (Thu, 15 Feb 2007)
New Revision: 1083

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1083

Log:
improve my quilt-foo and actually include the changes to parse_spoolss.c in the patch this time
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-15 16:56:33 UTC (rev 1082)
+++ trunk/patches/patches-3.0.24/spoolss.diff	2007-02-15 17:04:18 UTC (rev 1083)
@@ -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-14 11:47:48.000000000 -0600
++++ samba-3.0.24/source/rpc_server/srv_spoolss_nt.c	2007-02-15 11:02:09.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-14 11:47:48.000000000 -0600
++++ samba-3.0.24/source/printing/nt_printing.c	2007-02-15 11:02:09.000000000 -0600
 @@ -2984,11 +2984,15 @@
  	return True;
  }
@@ -171,7 +171,7 @@
 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-14 11:47:48.000000000 -0600
++++ samba-3.0.24/source/rpc_server/srv_spoolss.c	2007-02-15 11:02:09.000000000 -0600
 @@ -1477,6 +1477,15 @@
  	ZERO_STRUCT(r_u);
  	
@@ -188,3 +188,25 @@
  		DEBUG(0,("spoolss_io_q_addprinterdriverex: unable to unmarshall SPOOL_Q_ADDPRINTERDRIVEREX.\n"));
  		return False;
  	}
+Index: samba-3.0.24/source/rpc_parse/parse_spoolss.c
+===================================================================
+--- samba-3.0.24.orig/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:19.000000000 -0600
++++ samba-3.0.24/source/rpc_parse/parse_spoolss.c	2007-02-15 11:02:25.000000000 -0600
+@@ -3893,7 +3893,16 @@
+ 		}
+ 		case 3:
+ 		{
+-			ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
++			/* FIXME ! Our parsing here is wrong I think,
++			 * but for a level3 it makes no sense for
++			 * ptr_sec_desc to be NULL. JRA. Based on
++			 * a Vista sniff from Martin Zielinski <mz at seh.de>.
++			 */
++			if (UNMARSHALLING(ps)) {
++				ptr_sec_desc = 1;
++			} else {
++				ptr_sec_desc = q_u->info.info_3->secdesc_ptr;
++			}
+ 			break;
+ 		}
+ 	}