diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-02-17 05:07:06 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-02-17 05:07:06 +0000 |
| commit | e479e74c3b1a9d78e86a461a89b27a3c17ddb9d4 (patch) | |
| tree | 391235cdc3b48f54a1190b0249b34c4f95397035 /src | |
| parent | 45bd269a28a4ffd0b136e55ad2bac88dd260c95b (diff) | |
| download | krb5-e479e74c3b1a9d78e86a461a89b27a3c17ddb9d4.tar.gz krb5-e479e74c3b1a9d78e86a461a89b27a3c17ddb9d4.tar.xz krb5-e479e74c3b1a9d78e86a461a89b27a3c17ddb9d4.zip | |
If the configuration file does not exist (context->profile == NULL)
return KRB5_CONFIG_CANTOPEN; if the default realm is not defined in
the configuration file, return an error message saying so. These
changes just make the diagnostic error messages more clear.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7486 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 9 | ||||
| -rw-r--r-- | src/lib/krb5/os/def_realm.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index c07b3609f..97e266600 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,12 @@ +Sat Feb 17 00:05:38 1996 Theodore Y. Ts'o <tytso@pao.MIT.EDU> + + * def_realm.c (krb5_get_default_realm): If the configuration file + does not exist (context->profile == NULL) return + KRB5_CONFIG_CANTOPEN; if the default realm is not defined + in the configuration file, return an error message saying + so. These changes just make the diagnostic error + messages more clear. + Thu Jan 11 18:32:54 1996 Ezra Peisach (epeisach@paris) * Makefile.in (check-unix): Ultrix test does not support -x. diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c index 06c27fafc..053a604be 100644 --- a/src/lib/krb5/os/def_realm.c +++ b/src/lib/krb5/os/def_realm.c @@ -62,13 +62,13 @@ krb5_get_default_realm(context, lrealm) * on the host's DNS domain. */ context->default_realm = 0; + if (context->profile == 0) + return KRB5_CONFIG_CANTOPEN; retval = profile_get_string(context->profile, "libdefaults", "default_realm", 0, 0, &context->default_realm); - if (retval == PROF_NO_PROFILE) - return KRB5_CONFIG_CANTOPEN; if (context->default_realm == 0) - return(KRB5_CONFIG_BADFORMAT); + return(KRB5_CONFIG_NODEFREALM); } realm = context->default_realm; |