aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-06-03 22:55:52 +0000
committerKen Raeburn <raeburn@mit.edu>2003-06-03 22:55:52 +0000
commit371bcec4de7f7c8c68ac4bb5db0383dd54dad158 (patch)
tree89d0bc2098246b46e0b509a02f50d7ec9cdf4547
parentba9a98383c58347c3482e9d8ab95bd50650bc1db (diff)
downloadkrb5-371bcec4de7f7c8c68ac4bb5db0383dd54dad158.zip
krb5-371bcec4de7f7c8c68ac4bb5db0383dd54dad158.tar.gz
krb5-371bcec4de7f7c8c68ac4bb5db0383dd54dad158.tar.bz2
* 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
-rw-r--r--README4
-rw-r--r--src/lib/krb4/ChangeLog5
-rw-r--r--src/lib/krb4/RealmsConfig-glue.c19
3 files changed, 9 insertions, 19 deletions
diff --git a/README b/README
index cefd280..e146d15 100644
--- 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 6c91745..d177d1f 100644
--- 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 52437ee..d58de96 100644
--- 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;
}