Makefile.in (check-unix): Add a test case to make sure

	krb5_get_host_realm does something sane when passed in a
	hostname which doesn't have a default domain.

hst_realm.c (krb5_get_host_realm): If an hostname does not have
	a domain, don't try to get a domain default (which
	results in a strange error being returned).

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 41e501380174aef4a09f207422705d86c20e9922..23aec1672eb121353d0d8c3cea5ace2f377e907f 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,5 +1,13 @@
 Fri Sep  1 00:47:27 1995  Theodore Y. Ts'o  <tytso@dcl>
 
+       * Makefile.in (check-unix): Add a test case to make sure
+               krb5_get_host_realm does something sane when passed in a
+               hostname which doesn't have a default domain.
+
+       * hst_realm.c (krb5_get_host_realm): If an hostname does not have
+               a domain, don't try to get a domain default (which
+               results in a strange error being returned).
+
        * toffset.c: Added new file which implements the abstract
                interfaces for manipulating the time offset fields in the
                os context.

diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index 72228c30353535f704b6e5bab23f79c4c188dcfe..81e46851b1672f0e7f887bd69fc535c94ef8731c 100644 (file)
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -121,7 +121,7 @@ check-unix:: $(TEST_PROGS)
                -k IGGY.ORG -k DEFAULT_REALM.TST \
                -D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \
                -r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \
-               -r pgp.good.idea > test.out
+               -r pgp.good.idea -r no_domain > test.out
        cmp test.out $(srcdir)/ref_std_conf.out
        $(RM) test.out
 

diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 3cd1355665a86812f819124792a1748da942ffa1..5ecbd6ebd39abbef900501944eb787c99044c055 100644 (file)
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -123,12 +123,14 @@ krb5_get_host_realm(context, host, realmsp)
        }
     }
 
-    retval = profile_get_string(context->profile, "domain_realm", domain,
-                               0, default_realm, &realm);
-    free(default_realm);
-    if (retval)
-       return retval;
-    default_realm = realm;
+    if (domain) {
+       retval = profile_get_string(context->profile, "domain_realm",
+                                   domain, 0, default_realm, &realm);
+       free(default_realm);
+       if (retval)
+           return retval;
+       default_realm = realm;
+    }
 
     retval = profile_get_string(context->profile, "domain_realm", local_host,
                                0, default_realm, &realm);

diff --git a/src/lib/krb5/os/ref_std_conf.out b/src/lib/krb5/os/ref_std_conf.out
index 45270828ae63f6afcf2d8ca0a86bd0a84a169e51..273a7664b6fce8646213ab8638f69154db406ac9 100644 (file)
--- a/src/lib/krb5/os/ref_std_conf.out
+++ b/src/lib/krb5/os/ref_std_conf.out
@@ -10,3 +10,4 @@ krb_get_host_realm(really.BAD.IDEA.) returned: 'NSA.GOV'
 krb_get_host_realm(clipper.bad.idea) returned: 'NIST.GOV'
 krb_get_host_realm(KeYEsCrOW.BaD.IDea) returned: 'NSA.GOV'
 krb_get_host_realm(pgp.good.idea) returned: 'GOOD.IDEA'
+krb_get_host_realm(no_domain) returned: 'NEW.DEFAULT.REALM'