oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_verify): use krb5_verify_user_lrealm

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7050 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-09-28 02:34:17 +00:00
parent f9120155fd
commit a5ea5cf66d
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
appl/login/login.c
View File

@@ -200,12 +200,12 @@ 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,
1, 1,
NULL); NULL);
krb5_free_principal(context, princ); krb5_free_principal(context, princ);
if (ret) if (ret)
krb5_free_context (context); krb5_free_context (context);
@@ -240,23 +240,24 @@ krb5_start_session (struct passwd *pwd)
char krb4tkfile[MAXPATHLEN]; char krb4tkfile[MAXPATHLEN];
krb5_get_default_realm(context, &realm); krb5_get_default_realm(context, &realm);
krb5_make_principal(context, &mcred.server, realm, krb5_make_principal(context, &mcred.server, realm,
"krbtgt", "krbtgt",
realm, realm,
NULL); NULL);
ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred); free (realm);
if(ret == 0) { ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred);
ret = krb524_convert_creds_kdc(context, &cred, &c); if(ret == 0) {
if(!ret) { ret = krb524_convert_creds_kdc(context, &cred, &c);
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT, if(ret == 0) {
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
getuid()); getuid());
krb_set_tkt_string(krb4tkfile); krb_set_tkt_string(krb4tkfile);
tf_setup(&c, c.pname, c.pinst); tf_setup(&c, c.pname, c.pinst);
} }
memset(&c, 0, sizeof(c)); memset(&c, 0, sizeof(c));
krb5_free_creds_contents(context, &cred); krb5_free_creds_contents(context, &cred);
} }
krb5_free_principal(context, mcred.server); krb5_free_principal(context, mcred.server);
} }
#endif #endif
krb5_cc_close(context, id2); krb5_cc_close(context, id2);

3
appl/su/su.c
View File

@@ -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);