(krb5_verify): use krb5_verify_user_lrealm
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7050 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -200,7 +200,7 @@ krb5_verify(struct passwd *pwd, const char *password)
|
|||||||
krb5_free_context(context);
|
krb5_free_context(context);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
ret = krb5_verify_user(context,
|
ret = krb5_verify_user_lrealm(context,
|
||||||
princ,
|
princ,
|
||||||
id,
|
id,
|
||||||
password,
|
password,
|
||||||
@@ -244,10 +244,11 @@ krb5_start_session (struct passwd *pwd)
|
|||||||
"krbtgt",
|
"krbtgt",
|
||||||
realm,
|
realm,
|
||||||
NULL);
|
NULL);
|
||||||
|
free (realm);
|
||||||
ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred);
|
ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred);
|
||||||
if(ret == 0) {
|
if(ret == 0) {
|
||||||
ret = krb524_convert_creds_kdc(context, &cred, &c);
|
ret = krb524_convert_creds_kdc(context, &cred, &c);
|
||||||
if(!ret) {
|
if(ret == 0) {
|
||||||
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
|
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
|
||||||
getuid());
|
getuid());
|
||||||
krb_set_tkt_string(krb4tkfile);
|
krb_set_tkt_string(krb4tkfile);
|
||||||
|
@@ -162,8 +162,7 @@ krb5_verify(struct passwd *login_info, struct passwd *su_info,
|
|||||||
#endif
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
krb5_cc_initialize (context, ccache, p);
|
ret = krb5_verify_user_lrealm(context, p, ccache, NULL, TRUE, NULL);
|
||||||
ret = krb5_verify_user(context, p, ccache, NULL, TRUE, NULL);
|
|
||||||
if(ret) {
|
if(ret) {
|
||||||
krb5_free_principal (context, p);
|
krb5_free_principal (context, p);
|
||||||
krb5_cc_destroy(context, ccache);
|
krb5_cc_destroy(context, ccache);
|
||||||
|
Reference in New Issue
Block a user