Untangle assignment and result check.

Michael

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 8a2b82a61d3ddb4ea4e8dfae51bb0e4ecc0766fa..ae8e1e4d4d01703b9c64d50964e85cfaadc7f4f2 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -448,9 +448,9 @@ got_connection:
        
        /* Otherwise setup the TCP LDAP session */
 
-       if ( (ads->ldap.ld = ldap_open_with_timeout(ads->config.ldap_server_name, 
-               LDAP_PORT, lp_ldap_timeout())) == NULL )
-       {
+       ads->ldap.ld = ldap_open_with_timeout(ads->config.ldap_server_name,
+                                             LDAP_PORT, lp_ldap_timeout());
+       if (ads->ldap.ld == NULL) {
                return ADS_ERROR(LDAP_OPERATIONS_ERROR);
        }