Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test

diff --combined WHATSNEW.txt
index 240e307722ad34d6437e67ab5ff0cbd5c2c19ab3,0af6a15090c429d20879ddb4a6f4b4b9dbd1df39..919039db297ddf549e173226cd63e302adde71bd
--- 1/WHATSNEW.txt
--- 2/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@@ -1,11 -1,46 +1,46 @@@
+                    ===============================
+                    Release Notes for Samba 3.0.30
+                             May 28, 2008
+                    ===============================
+ 
+ This is a security release in order to address CVE-2008-1105 ("Boundary 
+ failure when parsing SMB responses can result in a buffer overrun").
+ 
+   o CVE-2008-1105
+     Specifically crafted SMB responses can result in a heap overflow 
+     in the Samba client code.  Because the server process, smbd, can 
+     itself act as a client during operations such as printer notification
+     and domain authentication,  this issue affects both Samba client 
+     and server installations.
+     
+ The original security announcement for this and past advisories can 
+ be found http://www.samba.org/samba/security/
+ 
+ 
+ ######################################################################
+ Changes
+ #######
+ 
+ Changes since 3.0.29
+ --------------------
+ 
+ o   Jeremy Allison <jra@samba.org>
+     * Fix for CVE-2008-1105.
+ 
+ 
+ o   Karolin Seeger <kseeger@samba.org>
+     * Remove man pages for ldb tools not included in Samba 3.0.
+ 
+ 
+ Release notes for older releases follow:
+ 
+       --------------------------------------------------
+ 
                     ===============================
                     Release Notes for Samba 3.0.29
                              May 20, 2008
                     ===============================
  
- This is a bug fix release of the Samba 3.0 production series and is the
- version that servers should be run for for all current Samba 3.0 bug fixes.  
- 
  Major bug fixes included in Samba 3.0.29 are:
  
    o Problems following domain trusts on a Samba DC.
@@@ -56,7 -91,7 +91,7 @@@ o   Gerald (Jerry) Carter <jerry@samba.
  
  
  o   Glenn Curtis <gcurtis@likewisesoftware.com>
 -    * Prevent cycle in Wibind's list of children when reaping dead processes.
 +    * Prevent cycle in Winbind's list of children when reaping dead processes.
  
  
  o   Steven Danneman <steven.danneman@isilon.com>
@@@ -104,7 -139,7 +139,7 @@@ o   Jim McDonough <jmcd@samba.org
  
  
  o   Karolin Seeger <kseeger@samba.org>
 -    * Documentation cleanup after r emerging docs from svn to git and 
 +    * Documentation cleanup after merging docs from svn to git and 
        back-porting from the v3-2 branch.
  
  
@@@ -128,8 -163,6 +163,6 @@@ o   Martin Zielinski <mz@seh.de
  
  
  
- Release notes for older releases follow:
- 
        --------------------------------------------------
  
                     ===============================