From a5ea5cf66d1348f42067e75fe65b8ec86948621a Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 28 Sep 1999 02:34:17 +0000
Subject: [PATCH] (krb5_verify): use krb5_verify_user_lrealm

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7050 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/login/login.c | 45 +++++++++++++++++++++++----------------------
 appl/su/su.c       |  3 +--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/appl/login/login.c b/appl/login/login.c
index a797d35fc..ba5b363b5 100644
--- a/appl/login/login.c
+++ b/appl/login/login.c
@@ -200,12 +200,12 @@ krb5_verify(struct passwd *pwd, const char *password)
 	krb5_free_context(context);
 	return 1;
     }
-    ret = krb5_verify_user(context,
-			   princ, 
-			   id,
-			   password, 
-			   1,
-			   NULL);
+    ret = krb5_verify_user_lrealm(context,
+				  princ, 
+				  id,
+				  password, 
+				  1,
+				  NULL);
     krb5_free_principal(context, princ);
     if (ret)
 	krb5_free_context (context);
@@ -240,23 +240,24 @@ krb5_start_session (struct passwd *pwd)
         char krb4tkfile[MAXPATHLEN];
 
         krb5_get_default_realm(context, &realm);
-        krb5_make_principal(context, &mcred.server, realm,
-                            "krbtgt",
-                            realm,
-                            NULL);
-        ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred);
-        if(ret == 0) {
-            ret = krb524_convert_creds_kdc(context, &cred, &c);
-            if(!ret) {
-                snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
+	krb5_make_principal(context, &mcred.server, realm,
+			    "krbtgt",
+			    realm,
+			    NULL);
+	free (realm);
+	ret = krb5_cc_retrieve_cred(context, id2, 0, &mcred, &cred);
+	if(ret == 0) {
+	    ret = krb524_convert_creds_kdc(context, &cred, &c);
+	    if(ret == 0) {
+		snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
 			 getuid());
-                krb_set_tkt_string(krb4tkfile);
-                tf_setup(&c, c.pname, c.pinst);
-            }
-            memset(&c, 0, sizeof(c));
-            krb5_free_creds_contents(context, &cred);
-        }
-        krb5_free_principal(context, mcred.server);
+		krb_set_tkt_string(krb4tkfile);
+		tf_setup(&c, c.pname, c.pinst);
+	    }
+	    memset(&c, 0, sizeof(c));
+	    krb5_free_creds_contents(context, &cred);
+	}
+	krb5_free_principal(context, mcred.server);
     }
 #endif
     krb5_cc_close(context, id2);
diff --git a/appl/su/su.c b/appl/su/su.c
index 522b3fe18..f4ac17dc8 100644
--- a/appl/su/su.c
+++ b/appl/su/su.c
@@ -162,8 +162,7 @@ krb5_verify(struct passwd *login_info, struct passwd *su_info,
 #endif
 	    return 1;
 	}
-	krb5_cc_initialize (context, ccache, p);
-	ret = krb5_verify_user(context, p, ccache, NULL, TRUE, NULL);
+	ret = krb5_verify_user_lrealm(context, p, ccache, NULL, TRUE, NULL);
 	if(ret) {
 	    krb5_free_principal (context, p);
 	    krb5_cc_destroy(context, ccache);