From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 9 Jun 2003 19:19:46 +0000 (+0000)
Subject: fix bug: would return krb.conf entries plus dns info
X-Git-Tag: krb5-1.4-beta1~859
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7ebfa978dac2b988680cd441c4e83d8d6c01cab9;p=krb5.git

fix bug: would return krb.conf entries plus dns info

* RealmsConfig-glue.c (krb_get_krbhst): Don't fall back to DNS if entries were
found in krb.conf, and just not enough to fill the request.

ticket: 1550
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15599 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 78021caee..faeba02ab 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* RealmsConfig-glue.c (krb_get_krbhst): Don't fall back to DNS if
+	entries were found in krb.conf, and just not enough to fill the
+	request.
+
 2003-06-06  Ken Raeburn  <raeburn@mit.edu>
 
 	* RealmsConfig-glue.c: Include k5-int.h.
diff --git a/src/lib/krb4/RealmsConfig-glue.c b/src/lib/krb4/RealmsConfig-glue.c
index 420f8b99b..67f95f5dc 100644
--- a/src/lib/krb4/RealmsConfig-glue.c
+++ b/src/lib/krb4/RealmsConfig-glue.c
@@ -484,6 +484,9 @@ krb_get_krbhst(
 	    strcpy(host, scratch);
 	    return KSUCCESS;
 	}
+	if (i > 0)
+	    /* Found some, but not as many as requested.  */
+	    return KFAILURE;
     } while (0);
 #ifdef KRB5_DNS_LOOKUP
     do {