Index: addressbook/backends/ldap/e-book-backend-ldap.c
===================================================================
--- addressbook/backends/ldap/e-book-backend-ldap.c.orig
+++ addressbook/backends/ldap/e-book-backend-ldap.c
@@ -2457,6 +2457,8 @@ e_book_backend_ldap_get_contact_list (EB
 				diff -= start.tv_sec * 1000 + start.tv_usec/1000;
 
 				printf ("e_book_backend_ldap_get_contact_list invoked contact_list_handler ");
+                        	diff = end.tv_sec * 1000 + end.tv_usec/1000;
+                        	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
 				printf ("and took %ld.%03ld seconds\n", diff/1000, diff%1000);
 			}
 		}
Index: servers/exchange/storage/exchange-account.c
===================================================================
--- servers/exchange/storage/exchange-account.c.orig
+++ servers/exchange/storage/exchange-account.c
@@ -1983,6 +1983,9 @@ exchange_account_check_password_expiry (
 	E2kGlobalCatalogEntry *entry; /* This is never set before it's used! */
 	int max_pwd_age_days = -1;
 
+	/* Bull.  The comment above is totally bogus.  */
+	entry = NULL;
+
 	g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), 0);
 
 	max_pwd_age_days = find_passwd_exp_period (account, entry);