svn commit: samba-web r1018 - in trunk/patches: .

[jerry at samba.org]

Author: jerry
Date: 2006-07-25 21:18:49 +0000 (Tue, 25 Jul 2006)
New Revision: 1018

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

Log:
add the dns lookup fixes to with the patch page
Added:
   trunk/patches/patch-3.0.23a-lookup_dc_ads.patch
Modified:
   trunk/patches/index.html
   trunk/patches/series-3.0.23a


Changeset:
Modified: trunk/patches/index.html
===================================================================
--- trunk/patches/index.html	2006-07-24 12:00:03 UTC (rev 1017)
+++ trunk/patches/index.html	2006-07-25 21:18:49 UTC (rev 1018)
@@ -51,6 +51,11 @@
         groups such as Administrators on a Samba DC configured to use "passdb 
         backend = ldapsam&quot;</td>
   </tr>
+  <tr>
+    <td><a href="/samba/patches/patch-3.0.23a-lookup_dc_ads.patch">Contact AD DCs</a></td>
+    <td>Fix bad IP assignment in DC lookups and extended delays in CLDAP queries when 
+        configured for &quot;security = ads&quot;</td>
+  </tr>
   </tbody>
 </table>
 

Added: trunk/patches/patch-3.0.23a-lookup_dc_ads.patch
===================================================================
--- trunk/patches/patch-3.0.23a-lookup_dc_ads.patch	2006-07-24 12:00:03 UTC (rev 1017)
+++ trunk/patches/patch-3.0.23a-lookup_dc_ads.patch	2006-07-25 21:18:49 UTC (rev 1018)
@@ -0,0 +1,44 @@
+diff -urN --exclude-from=/home/drizzt/jerry/tmp/diff.excludes samba-3.0.23a/source/libads/cldap.c samba-3.0.23a-patched/source/libads/cldap.c
+--- samba-3.0.23a/source/libads/cldap.c	2006-07-21 11:22:57.000000000 -0500
++++ samba-3.0.23a-patched/source/libads/cldap.c	2006-07-25 16:14:03.000000000 -0500
+@@ -200,7 +200,7 @@
+ 	/* Setup timeout */
+ 	gotalarm = 0;
+ 	CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+-	alarm(lp_ldap_timeout());
++	alarm(5);
+ 	/* End setup timeout. */
+  
+ 	ret = read(sock, blob.data, blob.length);
+diff -urN --exclude-from=/home/drizzt/jerry/tmp/diff.excludes samba-3.0.23a/source/libads/dns.c samba-3.0.23a-patched/source/libads/dns.c
+--- samba-3.0.23a/source/libads/dns.c	2006-07-21 11:22:57.000000000 -0500
++++ samba-3.0.23a-patched/source/libads/dns.c	2006-07-25 15:14:34.000000000 -0500
+@@ -204,17 +204,11 @@
+ 
+ static int dnssrvcmp( struct dns_rr_srv *a, struct dns_rr_srv *b )
+ {
+-	BOOL init = False;
+-
+-	if ( !init ) {
+-		srand( (uint32)time(NULL) );
+-	}
+-
+ 	if ( a->priority == b->priority ) {
+ 
+ 		/* randomize entries with an equal weight and priority */
+ 		if ( a->weight == b->weight ) 
+-			return rand() % 2 ? -1 : 1;
++			return 0;
+ 
+ 		/* higher weights should be sorted lower */ 
+ 		if ( a->weight > b->weight )
+@@ -285,7 +279,7 @@
+ 	DEBUG(4,("ads_dns_lookup_srv: %d records returned in the answer section.\n", 
+ 		answer_count));
+ 		
+-	if ( (dcs = TALLOC_ARRAY(ctx, struct dns_rr_srv, answer_count)) == NULL ) {
++	if ( (dcs = TALLOC_ZERO_ARRAY(ctx, struct dns_rr_srv, answer_count)) == NULL ) {
+ 		DEBUG(0,("ads_dns_lookup_srv: talloc() failure for %d char*'s\n", 
+ 			answer_count));
+ 		return NT_STATUS_NO_MEMORY;
+ 

Modified: trunk/patches/series-3.0.23a
===================================================================
--- trunk/patches/series-3.0.23a	2006-07-24 12:00:03 UTC (rev 1017)
+++ trunk/patches/series-3.0.23a	2006-07-25 21:18:49 UTC (rev 1018)
@@ -3,3 +3,5 @@
 # See http://savannah.nongnu.org/projects/quilt and 
 # http://www.suse.de/~agruen/quilt.pdf
 
+patch-3.0.23a-lookup_dc_ads.patch
+patch-3.0.23a-samr_alias.patch