26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
Index: servers/exchange/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
|
|
--- servers/exchange/storage/exchange-account.c 6 Mar 2006 06:00:26 -0000 1.30
|
|
+++ servers/exchange/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)
|