svn commit: samba r7668 - in branches/SAMBA_4_0/source: include lib/socket

tridge at samba.org tridge at samba.org
Fri Jun 17 02:48:48 GMT 2005


Author: tridge
Date: 2005-06-17 02:48:48 +0000 (Fri, 17 Jun 2005)
New Revision: 7668

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

Log:
- setup HAVE_ILDAP to enable the ildap backend in ldb

- fixed a bug in socket_connect_ev()

Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/socket/connect.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-06-17 02:47:26 UTC (rev 7667)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-06-17 02:48:48 UTC (rev 7668)
@@ -83,6 +83,9 @@
 #define HAVE_ADS
 #endif
 
+/* tell ldb we have the internal ldap code */
+#define HAVE_ILDAP 1
+
 /*
  * Define VOLATILE if needed.
  */

Modified: branches/SAMBA_4_0/source/lib/socket/connect.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/connect.c	2005-06-17 02:47:26 UTC (rev 7667)
+++ branches/SAMBA_4_0/source/lib/socket/connect.c	2005-06-17 02:48:48 UTC (rev 7668)
@@ -56,7 +56,8 @@
 
 	status = socket_connect(sock, my_address, my_port, 
 				server_address, server_port, flags);
-	if (NT_STATUS_IS_ERR(status)) {
+	if (NT_STATUS_IS_ERR(status) && 
+	    !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 		return status;
 	}
 



More information about the samba-cvs mailing list