[SCM] Samba Shared Repository - branch v4-4-test updated

[Karolin Seeger]

The branch, v4-4-test has been updated
       via  ec4a00b man: Wrong option for parameter ldap ssl in smb.conf man page
       via  49d09f6 async_req: make async_connect_send() "reentrant"
      from  d6639d7 vfs_acl_xattr: objects without NT ACL xattr

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test


- Log -----------------------------------------------------------------
commit ec4a00bc781a65e778a4c90f9ca54d431a45540e
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date:   Sat Jul 16 20:14:15 2016 +0200

    man: Wrong option for parameter ldap ssl in smb.conf man page
    
    - "ldap ssl" does not accept the value "yes"
    - Replaced "start_tls" with "start tls".
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12023
    
    Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 976be8fe39c78acfd3c2a23302d26cc262be0ae0)
    
    Autobuild-User(v4-4-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-4-test): Fri Aug  5 13:37:41 CEST 2016 on sn-devel-144

commit 49d09f6e884386eb344d0c85b2f4d2b649ee94df
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Aug 3 15:00:45 2016 +0200

    async_req: make async_connect_send() "reentrant"
    
    Allow callers to pass in socket fds that where already passed to an
    earlier call of async_connect_send(). Callers expect this behaviour and
    it was working until 05d4dbda8357712cb81008e0d611fdb0e7239587 broke it.
    
    The proper fix would be to change callers to close the fd and start from
    scratch with a fresh socket.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12105
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Aug  4 05:03:21 CEST 2016 on sn-devel-144
    
    (cherry picked from commit 9c6a4ea2788808bdcc7bfea798d838ea56c3b5ec)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/ldap/ldapssl.xml |  4 ++--
 lib/async_req/async_sock.c           | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index a50c88e..a53d726 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -14,7 +14,7 @@
 
 	<para>LDAP connections should be secured where possible. This may be
 	done setting <emphasis>either</emphasis> this parameter to
-	<parameter moreinfo="none">Start_tls</parameter>
+	<parameter moreinfo="none">start tls</parameter>
 	<emphasis>or</emphasis> by specifying <parameter moreinfo="none">ldaps://</parameter> in
         the URL argument of <smbconfoption name="passdb backend"/>.</para>
 
@@ -36,7 +36,7 @@
 	Please note that this parameter does only affect <emphasis>rpc</emphasis>
 	methods. To enable the LDAPv3 StartTLS extended operation (RFC2830) for
 	<emphasis>ads</emphasis>, set
-	<smbconfoption name="ldap ssl">yes</smbconfoption>
+	<smbconfoption name="ldap ssl">start tls</smbconfoption>
 	<emphasis>and</emphasis>
 	<smbconfoption name="ldap ssl ads">yes</smbconfoption>.
 	See <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index c0ad8f3..a9e84d2 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -128,11 +128,21 @@ struct tevent_req *async_connect_send(
 	}
 
 	/*
-	 * The only errno indicating that the connect is still in
-	 * flight is EINPROGRESS, everything else is an error
+	 * The only errno indicating that an initial connect is still
+	 * in flight is EINPROGRESS.
+	 *
+	 * We get EALREADY when someone calls us a second time for a
+	 * given fd and the connect is still in flight (and returned
+	 * EINPROGRESS the first time).
+	 *
+	 * This allows callers like open_socket_out_send() to reuse
+	 * fds and call us with an fd for which the connect is still
+	 * in flight. The proper thing to do for callers would be
+	 * closing the fd and starting from scratch with a fresh
+	 * socket.
 	 */
 
-	if (errno != EINPROGRESS) {
+	if (errno != EINPROGRESS && errno != EALREADY) {
 		tevent_req_error(req, errno);
 		return tevent_req_post(req, ev);
 	}


-- 
Samba Shared Repository