svn commit: samba r1783 - in branches/SAMBA_2_2_RELEASE/source: include rpc_server

[jerry]

Author: jerry
Date: 2004-08-12 18:31:10 +0000 (Thu, 12 Aug 2004)
New Revision: 1783
WebSVN: 
http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_2_2_RELEASE/source&rev=1783&nolog=1
Log:
don't crash when xp sp2 sends a fnpcn() without prior ffpcn()
Modified:
   branches/SAMBA_2_2_RELEASE/source/include/version.h
   branches/SAMBA_2_2_RELEASE/source/rpc_server/srv_spoolss_nt.c

Changeset:
Modified: branches/SAMBA_2_2_RELEASE/source/include/version.h
===================================================================
--- branches/SAMBA_2_2_RELEASE/source/include/version.h 2004-08-12 18:26:10 UTC (rev 
1782)
+++ branches/SAMBA_2_2_RELEASE/source/include/version.h 2004-08-12 18:31:10 UTC (rev 
1783)
@@ -1 +1 @@
-#define VERSION "2.2.10"
+#define VERSION "2.2.11"

Modified: branches/SAMBA_2_2_RELEASE/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- branches/SAMBA_2_2_RELEASE/source/rpc_server/srv_spoolss_nt.c       2004-08-12 
18:26:10 UTC (rev 1782)
+++ branches/SAMBA_2_2_RELEASE/source/rpc_server/srv_spoolss_nt.c       2004-08-12 
18:31:10 UTC (rev 1783)
@@ -2830,6 +2830,12 @@
        info->data=NULL;
        info->count=0;
 
+       /* a bug in xp sp2 rc2 causes it to send a fnpcn request without 
+          sending a ffpcn() request first */
+
+       if ( !option )
+               return WERR_BADFID;
+
        for (i=0; i<option->count; i++) {
                option_type=&(option->ctr.type[i]);
                
@@ -2891,6 +2897,12 @@
        info->data=NULL;
        info->count=0;
 
+       /* a bug in xp sp2 rc2 causes it to send a fnpcn request without 
+          sending a ffpcn() request first */
+
+       if ( !option )
+               return WERR_BADFID;
+
        get_printer_snum(p, hnd, &snum);
 
        for (i=0; i<option->count; i++) {