From 128b83fdf8c073916e5207b8b48210a4c29f5bc0 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Fri, 14 Jun 1996 09:45:50 +0000 Subject: [PATCH] use TKT_ROOT git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@581 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/popper/pop_pass.c | 17 ++++++++++++----- appl/xnlock/xnlock.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c index 44f90f48e..86f6609ba 100644 --- a/appl/popper/pop_pass.c +++ b/appl/popper/pop_pass.c @@ -39,6 +39,8 @@ pop_pass (POP *p) } if (!p->kerberosp) { + char tkt[MaxPathLen]; + /* We don't accept connections from users with null passwords */ if (pw->pw_passwd == NULL) return (pop_msg(p, @@ -46,11 +48,16 @@ pop_pass (POP *p) "Password supplied for \"%s\" is incorrect.", p->user)); - if (krb_verify_user(p->user, "", lrealm, p->pop_parm[1], 1) && - verify_unix_user(p->user, p->pop_parm[1])) - return (pop_msg(p,POP_FAILURE, - "Password supplied for \"%s\" is incorrect.", - p->user)); + sprintf (tkt, TKT_ROOT "_popper.%d", (int)getpid()); + krb_set_tkt_string (tkt); + if (krb_verify_user(p->user, "", lrealm, p->pop_parm[1], 1, "pop") && + verify_unix_user(p->user, p->pop_parm[1])) { + dest_tkt (); + return (pop_msg(p,POP_FAILURE, + "Password supplied for \"%s\" is incorrect.", + p->user)); + } + dest_tkt (); } else { if (kuserok (&kdata, p->user)) { pop_log(p, POP_FAILURE, diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c index 03bf7d8c0..389c4c0a1 100644 --- a/appl/xnlock/xnlock.c +++ b/appl/xnlock/xnlock.c @@ -550,7 +550,7 @@ verify(char *password) * Try to verify as user with kerberos. */ - ret = krb_verify_user(name, inst, realm, password, 0); + ret = krb_verify_user(name, inst, realm, password, 0, NULL); if(ret == KSUCCESS){ if(k_hasafs())