svn commit: samba-web r1266 - in trunk/patches: . patches-3.3.0

kseeger at samba.org kseeger at samba.org
Fri Jan 30 14:07:15 GMT 2009


Author: kseeger
Date: 2009-01-30 14:07:15 +0000 (Fri, 30 Jan 2009)
New Revision: 1266

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1266

Log:
Add patch for Samba 3.3.0
Karolin
Added:
   trunk/patches/patches-3.3.0/
   trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch
   trunk/patches/patches-3.3.0/series
Removed:
   trunk/patches/patches-3.0.24/
   trunk/patches/patches-3.2.1/
   trunk/patches/series-3.0.24
   trunk/patches/series-3.2.1
Modified:
   trunk/patches/index.html
   trunk/patches/patches
   trunk/patches/series


Changeset:
Modified: trunk/patches/index.html
===================================================================
--- trunk/patches/index.html	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/index.html	2009-01-30 14:07:15 UTC (rev 1266)
@@ -1,18 +1,18 @@
-<!--#include virtual="/samba/header.html" --> 
+<!--#include virtual="/samba/header.html" -->
   <title>Samba - opening windows to a wider world</title>
 <!--#include virtual="/samba/header_columns.html" -->
 
 <h2>Patches for Recent Releases</h2>
 
-<p>In order to better support the Samba community, this page 
+<p>In order to better support the Samba community, this page
    contains recommended patches for the most recent production
-   releases.  These patches have been integrated into the 
-   main Samba development trees for the next version of Samba 
-   3.0.x.</p>
+   releases.  These patches have been integrated into the
+   main Samba development trees for the next version of Samba.
+</p>
 
 <p>Follow these instructions for applying patches:</p>
-<pre>$ tar zxvf samba-3.0.x.tar.gz
-$ cd samba-3.0.x
+<pre>$ tar zxvf samba-3.x.y.tar.gz
+$ cd samba-3.x.y
 $ patch -p1 &lt; &quot;downloaded_patch_file&quot;
 $ cd source
 </pre>
@@ -31,47 +31,24 @@
 <p>....build Samba as normal....</p>
 
 <p>Please note that in some cases it will be necessary to regenerate
-   the configure script by executing autogen.sh located in the 
-   source/ directory.  In all cases, it is best to do a clean build 
+   the configure script by executing autogen.sh located in the
+   source/ directory.  In all cases, it is best to do a clean build
    after applying any patches.</p>
 
 <!-- Each release gets its own table. -->
 
 <table class="real">
   <thead>
-    <tr><th colspan="2"><b>Samba 3.0.24</b></th></tr>
+    <tr><th colspan="2"><b>Samba 3.3.0</b></th></tr>
   </thead>
   <tbody>
   <tr>
     <td><em>Patch</em></td><td><em>Description</em></td>
   </tr>
   <tr>
-    <td><a href="/samba/patches/patches-3.0.24/share_security_ntlmv2.diff">security = share and NTLMv2</a></td>
-    <td>Fixes an issues with servers set to &quot;security = share&quot; and Vista
-  clients that send NTLMv2 responses by default.</td>
+    <td><a href="/samba/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch">fix ads domain join</a></td>
+    <td>Fixes the domain join on domain members using "<i>security = ads</i>".</td>
   </tr>
-  <tr>
-    <td><a href="/samba/patches/patches-3.0.24/spoolss.diff">Vista Point-n-Print</a></td>
-    <td>Fixes several point-n-print bugs with Vista clients.</td>
-  </tr>
-  <tr>
-  <tr>
-    <td><a href="/samba/patches/patches-3.0.24/vista_backup_acl.diff">BUG 4361</a></td>
-    <td>Fix failure when using the Vista backup utility.</td>
-  </tr>
-  <tr>
-    <td><a href="/samba/patches/patches-3.0.24/variable_os_expansion.diff">BUG 4093</a></td>
-    <td>Fix expansion of the %a smb.conf variable for Vista clients.</td>
-  </tr>
-  <tr>
-    <td><a href="/samba/patches/patches-3.0.24/dfs_referral.diff">BUG 4356</a></td>
-    <td>Fix MS-DFS referrals with Windows Vista clients.</td>
-  </tr>
-  <tr>
-    <td><a
-  href="/samba/patches/patches-3.0.24/directory_delete.diff">BUG 4188</a></td>
-    <td>Fix for Vista failing to delete directories on a Samba share.</td>
-  </tr>
   </tbody>
 </table>
 

Modified: trunk/patches/patches
===================================================================
--- trunk/patches/patches	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/patches	2009-01-30 14:07:15 UTC (rev 1266)
@@ -1 +1 @@
-link patches-3.2.1
\ No newline at end of file
+link patches-3.3.0
\ No newline at end of file

Added: trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch
===================================================================
--- trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch	2009-01-30 14:07:15 UTC (rev 1266)
@@ -0,0 +1,37 @@
+From d332da87068cd72489941010a33e372ab53d3bcc Mon Sep 17 00:00:00 2001
+From: Michael Adam <obnox at samba.org>
+Date: Thu, 29 Jan 2009 13:17:46 +0100
+Subject: [PATCH] fix bug #6073: prevent ads_connect() from using SSL unless explicitly requested
+
+This fixes "net ads join".
+It copes with the changed default "ldap ssl = start tls".
+A new boolean option "ldap ssl : ads" is added to allow for
+explicitly requesting ssl with  ads.
+
+Michael
+---
+ source/libads/ldap.c |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/source/libads/ldap.c b/source/libads/ldap.c
+index f3bc2c5..5c95d4f 100644
+--- a/source/libads/ldap.c
++++ b/source/libads/ldap.c
+@@ -672,9 +672,11 @@ got_connection:
+ 
+ 	ldap_set_option(ads->ldap.ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+ 
+-	status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
+-	if (!ADS_ERR_OK(status)) {
+-		goto out;
++	if (lp_parm_bool(-1, "ldap ssl", "ads", false)) {
++		status = ADS_ERROR(smb_ldap_start_tls(ads->ldap.ld, version));
++		if (!ADS_ERR_OK(status)) {
++			goto out;
++		}
+ 	}
+ 
+ 	/* fill in the current time and offsets */
+-- 
+1.6.0.2
+

Added: trunk/patches/patches-3.3.0/series
===================================================================
--- trunk/patches/patches-3.3.0/series	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/patches-3.3.0/series	2009-01-30 14:07:15 UTC (rev 1266)
@@ -0,0 +1 @@
+0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch

Modified: trunk/patches/series
===================================================================
--- trunk/patches/series	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/series	2009-01-30 14:07:15 UTC (rev 1266)
@@ -1 +1 @@
-link patches-3.2.1/series
\ No newline at end of file
+link patches-3.3.0/series
\ No newline at end of file

Deleted: trunk/patches/series-3.0.24
===================================================================
--- trunk/patches/series-3.0.24	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/series-3.0.24	2009-01-30 14:07:15 UTC (rev 1266)
@@ -1 +0,0 @@
-link patches-3.0.24/series
\ No newline at end of file

Deleted: trunk/patches/series-3.2.1
===================================================================
--- trunk/patches/series-3.2.1	2009-01-27 08:51:32 UTC (rev 1265)
+++ trunk/patches/series-3.2.1	2009-01-30 14:07:15 UTC (rev 1266)
@@ -1 +0,0 @@
-link patches-3.2.1/series
\ No newline at end of file



More information about the samba-cvs mailing list