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

Added support for spaces in passwords and S/Key.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@854 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1996-10-17 19:38:51 +00:00
parent b8dc2786d1
commit 921c4c3aff
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
appl/popper/pop_pass.c
View File

@@ -12,10 +12,6 @@ static char SccsId[] = "@(#)@(#)pop_pass.c 2.3 2.3 4/2/91";
#include <popper.h> #include <popper.h>
RCSID("$Id$"); RCSID("$Id$");
#ifdef KERBEROS
extern AUTH_DAT kdata;
#endif /* KERBEROS */
/* /*
* pass: Obtain the user password from a POP client * pass: Obtain the user password from a POP client
*/ */
@@ -26,6 +22,12 @@ pop_pass (POP *p)
struct passwd * pw; struct passwd * pw;
char lrealm[REALM_SZ]; char lrealm[REALM_SZ];
int status; int status;
int i;
/* Make one string of all these parameters */
for (i = 1; i < p->parm_count; ++i)
p->pop_parm[i][strlen(p->pop_parm[i])] = ' ';
/* Look for the user in the password file */ /* Look for the user in the password file */
if ((pw = k_getpwnam(p->user)) == NULL) if ((pw = k_getpwnam(p->user)) == NULL)
@@ -33,8 +35,9 @@ pop_pass (POP *p)
"Password supplied for \"%s\" is incorrect.",p->user)); "Password supplied for \"%s\" is incorrect.",p->user));
if ((status = krb_get_lrealm(lrealm,1)) == KFAILURE) { if ((status = krb_get_lrealm(lrealm,1)) == KFAILURE) {
pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client, kdata.pname, pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client,
kdata.pinst, kdata.prealm, krb_get_err_text(status)); p->kdata.pname, p->kdata.pinst, p->kdata.prealm,
krb_get_err_text(status));
return(pop_msg(p,POP_FAILURE, return(pop_msg(p,POP_FAILURE,
"Kerberos error: \"%s\".", krb_get_err_text(status))); "Kerberos error: \"%s\".", krb_get_err_text(status)));
} }
@@ -51,6 +54,16 @@ pop_pass (POP *p)
sprintf (tkt, TKT_ROOT "_popper.%d", (int)getpid()); sprintf (tkt, TKT_ROOT "_popper.%d", (int)getpid());
krb_set_tkt_string (tkt); krb_set_tkt_string (tkt);
#ifdef SKEY
if (skeyverify (&p->sk, p->pop_parm[1]) == 0)
;
else if(!p->permit_passwd)
return pop_msg(p, POP_FAILURE,
"Password supplied for \"%s\" is incorrect.",
p->user);
else
#endif
if (krb_verify_user(p->user, "", lrealm, p->pop_parm[1], 1, "pop") && if (krb_verify_user(p->user, "", lrealm, p->pop_parm[1], 1, "pop") &&
unix_verify_user(p->user, p->pop_parm[1])) { unix_verify_user(p->user, p->pop_parm[1])) {
dest_tkt (); dest_tkt ();
@@ -60,11 +73,11 @@ pop_pass (POP *p)
} }
dest_tkt (); dest_tkt ();
} else { } else {
if (kuserok (&kdata, p->user)) { if (kuserok (&p->kdata, p->user)) {
pop_log(p, POP_FAILURE, pop_log(p, POP_FAILURE,
"%s: (%s.%s@%s) tried to retrieve mail for %s.", "%s: (%s.%s@%s) tried to retrieve mail for %s.",
p->client, kdata.pname, kdata.pinst, kdata.prealm, p->client, p->kdata.pname, p->kdata.pinst,
p->user); p->kdata.prealm, p->user);
return(pop_msg(p,POP_FAILURE, return(pop_msg(p,POP_FAILURE,
"Popping not authorized")); "Popping not authorized"));
} }