* RealmsConfig-glue.c (get_krbhst_default): Deleted.

(krb_get_krbhst): Don't call it.

ticket: 1551
status: open

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

diff --git a/README b/README
index cefd2807cec73e8705831eeafafa3361d83370c8..e146d15f39952b1a7dd8cde7965bc2c134171552 100644 (file)
--- a/README
+++ b/README
@@ -170,6 +170,10 @@ Major changes listed by ticket ID
 * [1491] The client-side functionality of the krb524 library has been
   moved into the krb5 library.
 
+* [1551] The heuristic for locating the Kerberos v4 KDC by prepending
+  "kerberos." to the realm name if no config file or DNS information
+  is available has been removed.
+
 Minor changes listed by ticket ID
 ---------------------------------
 

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 6c917452e7f2509ab2b734c29236a70dbceb550d..d177d1f2146a2ffd39f1a37fab21aee1f9869638 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-03  Ken Raeburn  <raeburn@mit.edu>
+
+       * RealmsConfig-glue.c (get_krbhst_default): Deleted.
+       (krb_get_krbhst): Don't call it.
+
 2003-06-03  Sam Hartman  <hartmans@mit.edu>
 
        * g_pw_in_tkt.c (passwd_to_key): Fix password prompt

diff --git a/src/lib/krb4/RealmsConfig-glue.c b/src/lib/krb4/RealmsConfig-glue.c
index 52437ee9855b9c9fd03d41cadf37733b8bd40363..d58de963a1aa4883eee80608539fb3278bbe8de8 100644 (file)
--- a/src/lib/krb4/RealmsConfig-glue.c
+++ b/src/lib/krb4/RealmsConfig-glue.c
@@ -359,23 +359,6 @@ krb_get_kpasswdhst(
                            REALMS_V4_PROF_KPASSWD_KDC);
 }
 
-static int
-get_krbhst_default(h, r, n)
-    char *h;
-    char *r;
-    int n;
-{
-    if (n != 1)
-       return KFAILURE;
-    if (strlen(KRB_HOST) + 1 + strlen(r) >= MAXHOSTNAMELEN)
-       return KFAILURE;
-    /* KRB_HOST.REALM (ie. kerberos.CYGNUS.COM) */
-    strcpy(h, KRB_HOST);
-    strcat(h, ".");
-    strcat(h, r);
-    return KSUCCESS;
-}
-
 /*
  * Realm, index -> KDC mapping
  *
@@ -466,8 +449,6 @@ krb_get_krbhst(
        else
            result = KFAILURE;
     } while (0);
-    if (result == KFAILURE)
-       result = get_krbhst_default(host, realm, n);
     return result;
 }