From 298b64f1e800447c89d9dc5c68a286ecb9b8b2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Groenvall?= <bg@sics.se>
Date: Mon, 15 Mar 1999 13:36:27 +0000
Subject: [PATCH] Integrate Assars multi-realm patch.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5542 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/ftpd.c          | 3 ++-
 appl/popper/pop_pass.c        | 3 ++-
 appl/xnlock/xnlock.c          | 2 +-
 lib/auth/afskauthlib/verify.c | 2 +-
 lib/auth/pam/pam.c            | 2 +-
 lib/auth/sia/sia.c            | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 2a8e4edc4..3aa755467 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -788,7 +788,8 @@ pass(char *passwd)
 #ifdef KRB4
 		    char realm[REALM_SZ];
 		    if((rval = krb_get_lrealm(realm, 1)) == KSUCCESS)
-			rval = krb_verify_user(pw->pw_name, "", realm, 
+			rval = krb_verify_user_multiple(pw->pw_name,
+							"", realm, 
 					       passwd, 1, NULL);
 		    if (rval == KSUCCESS ) {
 			chown (tkt_string(), pw->pw_uid, pw->pw_gid);
diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c
index 5b9ad6cae..caa17af03 100644
--- a/appl/popper/pop_pass.c
+++ b/appl/popper/pop_pass.c
@@ -26,7 +26,8 @@ krb4_verify_password (POP *p)
 	      TKT_ROOT "_popper.%u", (unsigned)getpid());
     krb_set_tkt_string (tkt);
 
-    status = krb_verify_user(p->user, "", lrealm, p->pop_parm[1], 1, "pop");
+    status = krb_verify_user_multiple(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 4ff14a288..d2040362e 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(name, inst, realm, password, 0, NULL);
+    ret = krb_verify_user_multiple(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 848aaf782..9b6916ecc 100644
--- a/lib/auth/afskauthlib/verify.c
+++ b/lib/auth/afskauthlib/verify.c
@@ -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 (name, "", lrealm, password, 1, NULL);
+    ret = krb_verify_user_multiple (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 71d0f2324..96bdc11b8 100644
--- a/lib/auth/pam/pam.c
+++ b/lib/auth/pam/pam.c
@@ -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(name, inst, realm, pwd, 1, NULL);
+    ret = krb_verify_user_multiple(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 cfe82c1d1..7b8b77e30 100644
--- a/lib/auth/sia/sia.c
+++ b/lib/auth/sia/sia.c
@@ -282,7 +282,7 @@ common_auth(sia_collect_func_t *collect,
 		       toname, toinst, realm, name));
 	    return SIADFAIL;
 	}
-	ret = krb_verify_user(toname, toinst, realm,
+	ret = krb_verify_user_multiple(toname, toinst, realm,
 			      entity->password, getuid() == 0, NULL);
 	if(ret){
 	    SIA_DEBUG(("DEBUG", "krb_verify_user: %s", krb_get_err_text(ret)));