summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-04 21:56:57 +0100
committerMichael Adam <obnox@samba.org>2008-01-04 22:09:36 +0100
commit2cb68e3898046ea0dd2ddcf1e32dc7dffca79be8 (patch)
treeb4b93083b830863d083634ab6416f08ba7a9ddfc
parent34e579fce5a6cc9ffa60fbe6e797b2e6b35c879e (diff)
downloadsamba-2cb68e3898046ea0dd2ddcf1e32dc7dffca79be8.tar.gz
samba-2cb68e3898046ea0dd2ddcf1e32dc7dffca79be8.tar.bz2
samba-2cb68e3898046ea0dd2ddcf1e32dc7dffca79be8.zip
Untangle assignment and result check.
Michael (This used to be commit 465a3b356cffb855e26569d3752f15cac07208c0)
-rw-r--r--source3/libads/ldap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 8a2b82a61d..ae8e1e4d4d 100644
--- a/source3/libads/ldap.c
+++ b/source3/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);
}