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 78021caeec04c857a085d1a585714b8e081d36b4..faeba02abf23876dd377f1b64818e69bfb6fee31 100644 (file)
--- 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 420f8b99baf394bc3cf242e3001c2e0eda37b468..67f95f5dcec819a667ab3f8bf0e33e71c06576d8 100644 (file)
--- 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 {