[Evolution-exchange] Checks for password expiry and weakness
Harish Krishnaswamy <[email protected]>
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Message-ID | <[email protected]> |
Hi, The attached patch fixes an error in the verifying logic for attempting to connect via the NT domain. The change was suggested by Carlos Lozano. Let me know if it is OK to commit. Thanks, Harish _______________________________________________ Evolution-patches mailing list [email protected] http://mail.gnome.org/mailman/listinfo/evolution-patches
kerb-check.diff
(text/x-patch, 1.9 KB)
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/ChangeLog,v retrieving revision 1.66.2.2 diff -u -p -r1.66.2.2 ChangeLog --- ChangeLog 18 Apr 2006 14:41:51 -0000 1.66.2.2 +++ ChangeLog 19 Apr 2006 09:26:18 -0000 @@ -1,3 +1,12 @@ +2006-04-19 Harish Krishnaswamy <[email protected]> + + Patch suggested by Carlos Lozano <clozano at andago dot com> + + * storage/exchange-account.c (is_password_expired), + (exchange_account_set_password): Ensure checks for expiry or + weakness take effect while trying for nt domain. The conditionals + should be AND'ed not OR'ed. + 2006-04-18 Sushma Rai <[email protected]> * lib/e2k-uri.c (e2k_uri_new): Revert the changes made for extracting Index: storage/exchange-account.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-account.c,v retrieving revision 1.30 diff -u -p -r1.30 exchange-account.c --- storage/exchange-account.c 6 Mar 2006 06:00:26 -0000 1.30 +++ storage/exchange-account.c 19 Apr 2006 09:26:18 -0000 @@ -1000,7 +1000,7 @@ is_password_expired (ExchangeAccount *ac result = e2k_kerberos_check_password (ac->username, domain, ac->password); - if (result != E2K_KERBEROS_OK || + if (result != E2K_KERBEROS_OK && result != E2K_KERBEROS_PASSWORD_EXPIRED) { /* try again with nt domain */ domain = ac->nt_domain; @@ -1102,7 +1102,7 @@ exchange_account_set_password (ExchangeA result = e2k_kerberos_change_password (account->priv->username, domain, old_pass, new_pass); - if (result != E2K_KERBEROS_OK || result != E2K_KERBEROS_PASSWORD_TOO_WEAK) { + if (result != E2K_KERBEROS_OK && result != E2K_KERBEROS_PASSWORD_TOO_WEAK) { /* try with nt_domain */ domain = account->priv->nt_domain; if (domain)