Changeset 467 for branches

Timestamp:

Jun 17, 2010, 10:59:42 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.13 (security update)

Location:

branches/samba-3.3.x

Files:

• WHATSNEW.txt (modified) (3 diffs)
• packaging/RHEL-CTDB/samba.spec (modified) (1 diff)
• packaging/RHEL/makerpms.sh (modified) (1 diff)
• packaging/RHEL/samba.spec (modified) (1 diff)
• source/VERSION (modified) (1 diff)
• source/smbd/process.c (modified) (2 diffs)

branches/samba-3.3.x/WHATSNEW.txt

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                    ==============================
                    Release Notes for Samba 3.3.12
@@ -18 +62 @@
 
 
-Changes since 3.5.0
--------------------
+Changes since 3.
+-------------------
 
 
@@ -46 +90 @@
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    ==============================

branches/samba-3.3.x/packaging/RHEL-CTDB/samba.spec

@@ -6 +6 @@
 Packager: Samba Team <[email protected]>
 Name:         samba
-Version:      3.3.12
+Version:      3.3.1
 Release:      ctdb.1
 Epoch:        0

branches/samba-3.3.x/packaging/RHEL/makerpms.sh

@@ -21 +21 @@
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.3.12'
+VERSION='3.3.1'
 REVISION=''
 SPECFILE="samba.spec"

branches/samba-3.3.x/packaging/RHEL/samba.spec

@@ -6 +6 @@
 Packager: Samba Team <[email protected]>
 Name:         samba
-Version:      3.3.12
+Version:      3.3.1
 Release:      1
 Epoch:        0

branches/samba-3.3.x/source/VERSION

@@ -26 +26 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=12
+SAMBA_VERSION_RELEASE=1
 
 ########################################################

branches/samba-3.3.x/source/smbd/process.c

@@ -1646 +1646 @@
 {
         static char *orig_inbuf;
+
 
         /*
@@ -1680 +1681 @@
                 /* this is the first part of the chain */
                 orig_inbuf = inbuf;
-        }
-
+                orig_size = size;
+        }
+
+        /* Validate smb_off2 */
+        if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
+                exit_server_cleanly("Bad chained packet");
+                return;
+        }
         /*
          * We need to save the output the caller added to the chain so that we
          * can splice it into the final output buffer later.
          */
+
+
+
+
+
 
         caller_outputlen = outsize - smb_wct;