- fix for #3401 (PANIC: internal error) from samba svn

Changed files:
    samba-3401.patch -> 1.1
    samba.spec -> 1.317

diff --git a/samba-3401.patch b/samba-3401.patch
new file mode 100644 (file)
index 0000000..c851a1b
--- /dev/null
+++ b/samba-3401.patch
@@ -0,0 +1,14 @@
+--- samba-3.0.21a/source/libsmb/ntlmssp.c.old  2005-10-18 04:45:00.000000000 +0200
++++ samba-3.0.21a/source/libsmb/ntlmssp.c      2006-01-22 13:18:02.000000000 +0100
+@@ -384,6 +384,11 @@
+ 
+ void ntlmssp_weaken_keys(NTLMSSP_STATE *ntlmssp_state)
+ {
++      /* Nothing to weaken.  We certainly don't want to 'extend' the length... */
++      if (ntlmssp_state->session_key.length < 8) {
++              return;
++      }
++
+       /* Key weakening not performed on the master key for NTLM2
+          and does not occour for NTLM1.  Therefore we only need
+          to do this for the LM_KEY.

diff --git a/samba.spec b/samba.spec
index 539cc58de72996fc63b5f8d0e5e0ba1075048339..1e06da9d5aac923551bc6e6d4fd5ea5577235ad5 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -35,7 +35,7 @@ Summary(uk):  SMB 
 Summary(zh_CN):        Samba ¿Í»§¶ËºÍ·þÎñÆ÷
 Name:          samba
 Version:       3.0.21a
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Daemons
@@ -57,6 +57,7 @@ Patch2:               %{name}-setup-python.patch
 Patch3:                %{name}-FHS.patch
 Patch4:                %{name}-c++-nofail.patch
 Patch5:                %{name}-pthread.patch
+Patch6:                %{name}-3401.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -963,6 +964,7 @@ Documentacja samby w formacie PDF.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cd examples/VFS
 tar xjf %{SOURCE7}