[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3066-gfe79c8a
Volker Lendecke
vlendec at samba.org
Wed Jul 2 13:14:41 GMT 2008
The branch, v3-3-test has been updated
via fe79c8a5b726754703626ca0bff57074274c98c7 (commit)
via 6009ae329375b1c40e3d00df977ddccc8b5cc176 (commit)
from cc77db2acbc35cea58576f1e28c7a760a5e31609 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit fe79c8a5b726754703626ca0bff57074274c98c7
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jul 2 15:13:14 2008 +0200
Fix typo
commit 6009ae329375b1c40e3d00df977ddccc8b5cc176
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jul 2 15:13:01 2008 +0200
Tiny logic simplification: Remove an unnecessary else branch
-----------------------------------------------------------------------
Summary of changes:
source/winbindd/idmap_ad.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap_ad.c b/source/winbindd/idmap_ad.c
index 2e79413..ca1cf81 100644
--- a/source/winbindd/idmap_ad.c
+++ b/source/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) {
@@ -98,7 +98,8 @@ static ADS_STRUCT *ad_idmap_cached_connection_internal(void)
return NULL;
}
- /* the machine acct password might have change - fetch it every time */
+ /* the machine acct password might have changed - fetch it every
+ * time */
SAFE_FREE(ads->auth.password);
ads->auth.password = secrets_fetch_machine_password(lp_workgroup(), NULL, NULL);
--
Samba Shared Repository
More information about the samba-cvs
mailing list