summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-07-11 17:45:09 +0200
committerVolker Lendecke <vl@samba.org>2008-07-11 17:53:25 +0200
commitf7ee7d2fe96658aa102e94a7606ca8c1c52cae25 (patch)
tree7e0bb67084f4b8822788b3ffd9854aff1a11039f
parent0948a5cda8756cca1edbe0f430175b31111d2497 (diff)
downloadsamba-f7ee7d2fe96658aa102e94a7606ca8c1c52cae25.tar.gz
samba-f7ee7d2fe96658aa102e94a7606ca8c1c52cae25.tar.bz2
samba-f7ee7d2fe96658aa102e94a7606ca8c1c52cae25.zip
Revert "Tiny logic simplification: Remove an unnecessary else branch"
This reverts commit 6009ae329375b1c40e3d00df977ddccc8b5cc176. (This used to be commit b71ce00796efdd27b593bbbc36f5cbba23fe9240)
-rw-r--r--source3/winbindd/idmap_ad.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index b99da57a4a..2e79413ffc 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -77,15 +77,15 @@ static ADS_STRUCT *ad_idmap_cached_connection_internal(void)
if ( ads->config.realm && (expire > time(NULL))) {
return ads;
+ } else {
+ /* we own this ADS_STRUCT so make sure it goes away */
+ DEBUG(7,("Deleting expired krb5 credential cache\n"));
+ ads->is_mine = True;
+ ads_destroy( &ads );
+ ads_kdestroy(WINBIND_CCACHE_NAME);
+ ad_idmap_ads = NULL;
+ TALLOC_FREE( ad_schema );
}
-
- /* we own this ADS_STRUCT so make sure it goes away */
- DEBUG(7,("Deleting expired krb5 credential cache\n"));
- ads->is_mine = True;
- ads_destroy( &ads );
- ads_kdestroy(WINBIND_CCACHE_NAME);
- ad_idmap_ads = NULL;
- TALLOC_FREE( ad_schema );
}
if (!local) {