remove krb4 support
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24501 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -11,31 +11,6 @@
|
||||
|
||||
RCSID("$Id$");
|
||||
|
||||
#ifdef KRB4
|
||||
static int
|
||||
krb4_verify_password (POP *p)
|
||||
{
|
||||
int status;
|
||||
char lrealm[REALM_SZ];
|
||||
char tkt[MaxPathLen];
|
||||
|
||||
status = krb_get_lrealm(lrealm,1);
|
||||
if (status == KFAILURE) {
|
||||
pop_log(p, POP_PRIORITY, "%s: (%s.%s@%s) %s", p->client,
|
||||
p->kdata.pname, p->kdata.pinst, p->kdata.prealm,
|
||||
krb_get_err_text(status));
|
||||
return 1;
|
||||
}
|
||||
snprintf(tkt, sizeof(tkt), "%s_popper.%u", TKT_ROOT, (unsigned)getpid());
|
||||
krb_set_tkt_string (tkt);
|
||||
|
||||
status = krb_verify_user(p->user, "", lrealm,
|
||||
p->pop_parm[1], KRB_VERIFY_SECURE, "pop");
|
||||
dest_tkt(); /* no point in keeping the tickets */
|
||||
return status;
|
||||
}
|
||||
#endif /* KRB4 */
|
||||
|
||||
#ifdef KRB5
|
||||
static int
|
||||
krb5_verify_password (POP *p)
|
||||
@@ -164,22 +139,6 @@ pop_pass (POP *p)
|
||||
p->user));
|
||||
|
||||
if (p->kerberosp) {
|
||||
#ifdef KRB4
|
||||
if (p->version == 4) {
|
||||
if(kuserok (&p->kdata, p->user)) {
|
||||
pop_log(p, POP_PRIORITY,
|
||||
"%s: (%s.%s@%s) tried to retrieve mail for %s.",
|
||||
p->client, p->kdata.pname, p->kdata.pinst,
|
||||
p->kdata.prealm, p->user);
|
||||
return(pop_msg(p,POP_FAILURE,
|
||||
"Popping not authorized"));
|
||||
}
|
||||
pop_log(p, POP_INFO, "%s: %s.%s@%s -> %s",
|
||||
p->ipaddr,
|
||||
p->kdata.pname, p->kdata.pinst, p->kdata.prealm,
|
||||
p->user);
|
||||
} else
|
||||
#endif /* KRB4 */
|
||||
#ifdef KRB5
|
||||
if (p->version == 5) {
|
||||
char *name;
|
||||
@@ -224,9 +183,6 @@ pop_pass (POP *p)
|
||||
/* pass OK */;
|
||||
else {
|
||||
int ret = -1;
|
||||
#ifdef KRB4
|
||||
ret = krb4_verify_password (p);
|
||||
#endif
|
||||
#ifdef KRB5
|
||||
if(ret)
|
||||
ret = krb5_verify_password (p);
|
||||
|
Reference in New Issue
Block a user