diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c index caa17af03..083acde0c 100644 --- a/appl/popper/pop_pass.c +++ b/appl/popper/pop_pass.c @@ -26,8 +26,8 @@ krb4_verify_password (POP *p) TKT_ROOT "_popper.%u", (unsigned)getpid()); krb_set_tkt_string (tkt); - status = krb_verify_user_multiple(p->user, - "", lrealm, p->pop_parm[1], 1, "pop"); + status = krb_verify_user(p->user, + "", lrealm, p->pop_parm[1], 1, "pop"); dest_tkt(); /* no point in keeping the tickets */ return status; } diff --git a/appl/xnlock/xnlock.c b/appl/xnlock/xnlock.c index d2040362e..4ff14a288 100644 --- a/appl/xnlock/xnlock.c +++ b/appl/xnlock/xnlock.c @@ -632,7 +632,7 @@ verify(char *password) /* * Try to verify as user with kerberos 4. */ - ret = krb_verify_user_multiple(name, inst, realm, password, 0, NULL); + ret = krb_verify_user(name, inst, realm, password, 0, NULL); if (ret == KSUCCESS){ if (k_hasafs()) krb_afslog(NULL, NULL); diff --git a/lib/auth/afskauthlib/verify.c b/lib/auth/afskauthlib/verify.c index 9b6916ecc..4ba05f8d3 100644 --- a/lib/auth/afskauthlib/verify.c +++ b/lib/auth/afskauthlib/verify.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -68,7 +68,7 @@ afs_verify(char *name, "%s%d_%d", TKT_ROOT, (unsigned)pwd->pw_uid, (unsigned)getpid()); krb_set_tkt_string (tkt_string); - ret = krb_verify_user_multiple (name, "", lrealm, password, 1, NULL); + ret = krb_verify_user (name, "", lrealm, password, 1, NULL); if (ret == KSUCCESS) { if (k_hasafs()) { k_setpag (); diff --git a/lib/auth/pam/pam.c b/lib/auth/pam/pam.c index 96bdc11b8..184180d82 100644 --- a/lib/auth/pam/pam.c +++ b/lib/auth/pam/pam.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -80,7 +80,7 @@ doit(pam_handle_t *pamh, char *name, char *inst, char *pwd, char *tkt) krb_set_tkt_string(tkt); krb_get_lrealm(realm, 1); - ret = krb_verify_user_multiple(name, inst, realm, pwd, 1, NULL); + ret = krb_verify_user(name, inst, realm, pwd, 1, NULL); memset(pwd, 0, strlen(pwd)); switch(ret){ case KSUCCESS: diff --git a/lib/auth/sia/sia.c b/lib/auth/sia/sia.c index 7b8b77e30..8adc28728 100644 --- a/lib/auth/sia/sia.c +++ b/lib/auth/sia/sia.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -282,7 +282,7 @@ common_auth(sia_collect_func_t *collect, toname, toinst, realm, name)); return SIADFAIL; } - ret = krb_verify_user_multiple(toname, toinst, realm, + ret = krb_verify_user(toname, toinst, realm, entity->password, getuid() == 0, NULL); if(ret){ SIA_DEBUG(("DEBUG", "krb_verify_user: %s", krb_get_err_text(ret)));