diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-09-01 17:29:15 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-09-01 17:29:15 +0000 |
| commit | b905e53ad76c02f0406a66016d3a7d38a65e258f (patch) | |
| tree | 26cee2adba2b63c9e741d7df98bb4fe7e8afb7c8 /src | |
| parent | e84e9d564b2d1566bb19fff6ee38402e80741b31 (diff) | |
| download | krb5-b905e53ad76c02f0406a66016d3a7d38a65e258f.tar.gz krb5-b905e53ad76c02f0406a66016d3a7d38a65e258f.tar.xz krb5-b905e53ad76c02f0406a66016d3a7d38a65e258f.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/krb5/os/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/krb5/os/hst_realm.c | 14 | ||||
| -rw-r--r-- | src/lib/krb5/os/ref_std_conf.out | 1 |
4 files changed, 18 insertions, 7 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 41e5013801..23aec1672e 100644 --- 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 72228c3035..81e46851b1 100644 --- 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 3cd1355665..5ecbd6ebd3 100644 --- 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 45270828ae..273a7664b6 100644 --- 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' |