diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-18 09:37:04 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-18 10:00:58 -0400 |
| commit | b9303e06737e6a024239e9c9a6f05fb9ed0a977e (patch) | |
| tree | 1f7f32795adc1305946e0ecac41186adfe7a4eb7 | |
| parent | 4c2cf0bc498c59343257fbae6dd93ec1a9fb88bc (diff) | |
| download | sssd-b9303e06737e6a024239e9c9a6f05fb9ed0a977e.tar.gz sssd-b9303e06737e6a024239e9c9a6f05fb9ed0a977e.tar.xz sssd-b9303e06737e6a024239e9c9a6f05fb9ed0a977e.zip | |
Fix return value from remove_connection_callback() destructor
ldap_get_option() can only fail if the option we're removing has
already been removed. It is sufficient to log this and continue.
| -rw-r--r-- | src/providers/ldap/sdap_fd_events.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/providers/ldap/sdap_fd_events.c b/src/providers/ldap/sdap_fd_events.c index f989c2249..45c5bedc4 100644 --- a/src/providers/ldap/sdap_fd_events.c +++ b/src/providers/ldap/sdap_fd_events.c @@ -50,14 +50,7 @@ int get_fd_from_ldap(LDAP *ldap, int *fd) int remove_ldap_connection_callbacks(struct sdap_handle *sh) { #ifdef HAVE_LDAP_CONNCB - int ret; - - ret = talloc_free(sh->sdap_fd_events->conncb); - if (ret != 0) { - return EIO; - } - - sh->sdap_fd_events->conncb = NULL; + talloc_zfree(sh->sdap_fd_events->conncb); #endif return EOK; } @@ -78,7 +71,7 @@ static int remove_connection_callback(TALLOC_CTX *mem_ctx) } else { DEBUG(9, ("Successfully removed connection callback.\n")); } - return lret; + return EOK; } static int sdap_ldap_connect_callback_add(LDAP *ld, Sockbuf *sb, |