svn commit: samba r17230 - in branches/SAMBA_4_0/source/libcli/ldap: .

[metze at samba.org]

Author: metze
Date: 2006-07-25 12:48:40 +0000 (Tue, 25 Jul 2006)
New Revision: 17230

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

Log:
don't overwrite the error with NT_STATUS_NO_MEMORY

metze
Modified:
   branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c	2006-07-25 08:51:54 UTC (rev 17229)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_bind.c	2006-07-25 12:48:40 UTC (rev 17230)
@@ -377,16 +377,13 @@
 					    ldap_read_io_handler,
 					    conn,
 					    &sasl_socket);
-		if (NT_STATUS_IS_OK(status)) {
-			talloc_steal(conn->sock, sasl_socket);
-			talloc_unlink(conn, conn->sock);
-			conn->sock = sasl_socket;
-			packet_set_socket(conn->packet, conn->sock);
-		} else {
-			status = NT_STATUS_NO_MEMORY;
-			goto failed;
-		}
-		
+		if (!NT_STATUS_IS_OK(status)) goto failed;
+
+		talloc_steal(conn->sock, sasl_socket);
+		talloc_unlink(conn, conn->sock);
+		conn->sock = sasl_socket;
+		packet_set_socket(conn->packet, conn->sock);
+
 		conn->bind.type = LDAP_BIND_SASL;
 		conn->bind.creds = creds;
 	}