diff options
| author | Tom Yu <tlyu@mit.edu> | 2006-11-18 00:01:23 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2006-11-18 00:01:23 +0000 |
| commit | 59c163649753a182ca10134908486f70d003bf8f (patch) | |
| tree | 70181bfbc79a6c3ebfa087618e63fe7b45bd96b4 | |
| parent | a7bda6202d537e30ac553920563f767e9350d762 (diff) | |
| parent | d1696d2dfe9a1eab6da4eb8a5a8a4cf98d1d17af (diff) | |
| download | krb5-kfw-3.1.0-beta4.zip krb5-kfw-3.1.0-beta4.tar.gz krb5-kfw-3.1.0-beta4.tar.bz2 | |
tag kfw-3.1.0-beta4 (again)kfw-3.1.0-beta4
git-svn-id: svn://anonsvn.mit.edu/krb5/tags/kfw-3_1_0-beta4@18855 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/gic_pwd.c | 4 | ||||
| -rw-r--r-- | src/patchlevel.h | 2 | ||||
| -rw-r--r-- | src/windows/identity/ui/newcredwnd.c | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c index ef9a6b3..40288b9 100644 --- a/src/lib/krb5/krb/gic_pwd.c +++ b/src/lib/krb5/krb/gic_pwd.c @@ -161,12 +161,14 @@ krb5_get_init_creds_password(krb5_context context, krb5_creds *creds, krb5_princ } /* if the master is unreachable, return the error from the - slave we were able to contact */ + slave we were able to contact or reset the use_master flag */ if ((ret2 != KRB5_KDC_UNREACH) && (ret2 != KRB5_REALM_CANT_RESOLVE) && (ret2 != KRB5_REALM_UNKNOWN)) ret = ret2; + else + use_master = 0; } #ifdef USE_LOGIN_LIBRARY diff --git a/src/patchlevel.h b/src/patchlevel.h index ec1d9d2..b13acc9 100644 --- a/src/patchlevel.h +++ b/src/patchlevel.h @@ -55,4 +55,4 @@ #define KRB5_PATCHLEVEL 4 #define KRB5_RELTAIL "kfw-3.1.0-beta4" /* #undef KRB5_RELDATE */ -#define KRB5_RELTAG "tags/kfw-3_1_0-beta3" +#define KRB5_RELTAG "tags/kfw-3_1_0-beta4" diff --git a/src/windows/identity/ui/newcredwnd.c b/src/windows/identity/ui/newcredwnd.c index 7bad1e2..b876b02 100644 --- a/src/windows/identity/ui/newcredwnd.c +++ b/src/windows/identity/ui/newcredwnd.c @@ -1740,6 +1740,13 @@ static LRESULT nc_handle_wm_nc_notify(HWND hwnd, y += dy;
}
+ if (d->nc->n_prompts > 0 &&
+ d->nc->prompts[0]->hwnd_edit) {
+
+ SetFocus(d->nc->prompts[0]->hwnd_edit);
+
+ }
+
SelectObject(hdc, hfold);
ReleaseDC(d->dlg_main, hdc);
|