diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/WHATSNEW.txt samba-2.2.11/WHATSNEW.txt
--- samba-2.2.10/WHATSNEW.txt	Wed Jul 21 10:07:08 2004
+++ samba-2.2.11/WHATSNEW.txt	Thu Aug 12 19:25:33 2004
@@ -1,4 +1,26 @@
                  ==============================
+                 Release Notes for Samba 2.2.11
+                          Aug 12, 2004
+                 ==============================
+
+This is the latest stable release of the Samba 2.2 code base.
+
+Please note that the Samba 2.2 code tree will reach its End-Of-Life
+on October 1, 2004.  Administrators of existing Samba 2.2
+installations are encouraged to upgrade to the latest Samba 3.0.x
+release prior to that date.
+
+The Samba 2.2.11 release addresses the following bug:
+
+  o Crashes in smbd triggered by a Windows XP SP2 client sending 
+    a FindNextPrintChangeNotify() request without previously 
+    issuing FindFirstPrintChangeNotify().
+
+
+Older releases notes for 2.2.x distributions follow
+
+       ------------------------------------------------------
+                 ==============================
                  Release Notes for Samba 2.2.10
                           July 22, 2004
                  ==============================
@@ -27,8 +49,6 @@
 or v3.0.5.
 
 
-Older releases notes for 2.2.x distributions follow
-
        ------------------------------------------------------
 
                  =============================
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Caldera/OpenLinux/makerpms.sh samba-2.2.11/packaging/Caldera/OpenLinux/makerpms.sh
--- samba-2.2.10/packaging/Caldera/OpenLinux/makerpms.sh	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Caldera/OpenLinux/makerpms.sh	Thu Aug 12 19:31:12 2004
@@ -24,11 +24,11 @@
 
 # Start preparing the packages...
 if [ $devel -ne 0 ]; then
-        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba; mv samba samba-2.2.10 )
-        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.10.tar.gz samba-2.2.10; mv samba-2.2.10 samba )
+        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba; mv samba samba-2.2.11 )
+        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.11.tar.gz samba-2.2.11; mv samba-2.2.11 samba )
 else
-        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba-2.2.10 )
-        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.10.tar.gz samba-2.2.10 )
+        ( cd ../../../.. ; chown -R ${USERID}.${GRPID} samba-2.2.11 )
+        ( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.11.tar.gz samba-2.2.11 )
 fi
 
 cp -af *.spec *.spec-lsb $SPECDIR
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec
--- samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec	Thu Aug 12 19:31:12 2004
@@ -1,4 +1,4 @@
-%define Version 	2.2.10
+%define Version 	2.2.11
 %define date            1
 %define Vendor  	Caldera
 %define Dist		OpenLinux
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-lsb samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-lsb
--- samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-lsb	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-lsb	Thu Aug 12 19:31:12 2004
@@ -1,4 +1,4 @@
-%define Version 	2.2.10
+%define Version 	2.2.11
 %define date            1
 %define Vendor  	Caldera
 %define Dist		OpenLinux
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-sam samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-sam
--- samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-sam	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-sam	Thu Aug 12 19:31:12 2004
@@ -1,4 +1,4 @@
-%define Version 	2.2.10sam
+%define Version 	2.2.11sam
 %define date            1
 %define Vendor  	Caldera
 %define Dist		OpenLinux
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-team samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-team
--- samba-2.2.10/packaging/Caldera/OpenLinux/samba2.spec-team	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Caldera/OpenLinux/samba2.spec-team	Thu Aug 12 19:31:12 2004
@@ -1,4 +1,4 @@
-%define Version 	2.2.10
+%define Version 	2.2.11
 %define date            1
 %define Vendor  	Caldera
 %define Dist		OpenLinux
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Mandrake/makerpms.sh samba-2.2.11/packaging/Mandrake/makerpms.sh
--- samba-2.2.10/packaging/Mandrake/makerpms.sh	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Mandrake/makerpms.sh	Thu Aug 12 19:31:12 2004
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='2.2.10'
+VERSION='2.2.11'
 
 RPMVER=`rpm --version | awk '{print $3}'`
 echo The RPM Version on this machine is: $RPMVER
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/Mandrake/samba2.spec samba-2.2.11/packaging/Mandrake/samba2.spec
--- samba-2.2.10/packaging/Mandrake/samba2.spec	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/Mandrake/samba2.spec	Thu Aug 12 19:31:12 2004
@@ -3,7 +3,7 @@
 %define vscanver 0.3.1
 
 # 2.2.4 and 1 replace by samba-team at release
-%define pversion 2.2.10
+%define pversion 2.2.11
 %define prelease 1
 # For testing this setup:
 #%define pversion1 2.2.5
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/PHT/TurboLinux/makerpms.sh samba-2.2.11/packaging/PHT/TurboLinux/makerpms.sh
--- samba-2.2.10/packaging/PHT/TurboLinux/makerpms.sh	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/PHT/TurboLinux/makerpms.sh	Thu Aug 12 19:31:12 2004
@@ -6,8 +6,8 @@
 USERID=`id -u`
 GRPID=`id -g`
 
-( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-2.2.10 )
-( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.10.tar.gz samba-2.2.10 )
+( cd ../../../.. ; chown -R ${USERID}.${GRPID} ${SRCDIR}/samba-2.2.11 )
+( cd ../../../.. ; tar czvf ${SRCDIR}/samba-2.2.11.tar.gz samba-2.2.11 )
 cp -a *.spec $SPECDIR
 cp -a *.patch smb.* samba.log $SRCDIR
 cd $SPECDIR
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/PHT/TurboLinux/samba2.spec samba-2.2.11/packaging/PHT/TurboLinux/samba2.spec
--- samba-2.2.10/packaging/PHT/TurboLinux/samba2.spec	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/PHT/TurboLinux/samba2.spec	Thu Aug 12 19:31:12 2004
@@ -1,10 +1,10 @@
 Summary: Samba SMB client and server
 Name: samba
-Version: 2.2.10
+Version: 2.2.11
 Release: 1
 Copyright: GNU GPL version 2
 Group: Networking
-Source: ftp://samba.org/pub/samba/samba-2.2.10.tar.gz
+Source: ftp://samba.org/pub/samba/samba-2.2.11.tar.gz
 Patch: smbw.patch
 Requires: pam >= 0.64 kernel >= 2.2.1 glibc >= 2.1.2
 Prereq: chkconfig fileutils
@@ -12,7 +12,7 @@
 Prefix: /usr
 
 %package -n smbfs
-Version: 2.2.10
+Version: 2.2.11
 Release: 1
 Group: Utilities/File
 Summary: Programs to mount SMB shares.
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/RedHat/makerpms.sh samba-2.2.11/packaging/RedHat/makerpms.sh
--- samba-2.2.10/packaging/RedHat/makerpms.sh	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/RedHat/makerpms.sh	Thu Aug 12 19:31:12 2004
@@ -27,7 +27,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='2.2.10'
+VERSION='2.2.11'
 
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpm"
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/RedHat/samba2-devel.spec samba-2.2.11/packaging/RedHat/samba2-devel.spec
--- samba-2.2.10/packaging/RedHat/samba2-devel.spec	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/RedHat/samba2-devel.spec	Thu Aug 12 19:31:12 2004
@@ -1,6 +1,6 @@
 Summary: Samba SMB client and server
 Name: samba
-Version: 2.2.10
+Version: 2.2.11
 Release: 1
 Copyright: GNU GPL version 2
 Group: Networking
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/packaging/RedHat/samba2.spec samba-2.2.11/packaging/RedHat/samba2.spec
--- samba-2.2.10/packaging/RedHat/samba2.spec	Wed Jul 21 10:18:22 2004
+++ samba-2.2.11/packaging/RedHat/samba2.spec	Thu Aug 12 19:31:12 2004
@@ -1,6 +1,6 @@
 Summary: Samba SMB client and server
 Name: samba
-Version: 2.2.10
+Version: 2.2.11
 Release: 1
 Copyright: GNU GPL version 2
 Group: Networking
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/source/include/version.h samba-2.2.11/source/include/version.h
--- samba-2.2.10/source/include/version.h	Wed Jul 21 10:06:57 2004
+++ samba-2.2.11/source/include/version.h	Thu Aug 12 13:31:57 2004
@@ -1 +1 @@
-#define VERSION "2.2.10"
+#define VERSION "2.2.11"
diff -u -r --new-file --exclude .svn --exclude CVS samba-2.2.10/source/rpc_server/srv_spoolss_nt.c samba-2.2.11/source/rpc_server/srv_spoolss_nt.c
--- samba-2.2.10/source/rpc_server/srv_spoolss_nt.c	Wed Jul 21 10:04:45 2004
+++ samba-2.2.11/source/rpc_server/srv_spoolss_nt.c	Thu Aug 12 13:31:57 2004
@@ -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++) {