diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1997-03-03 20:16:55 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1997-03-03 20:16:55 +0000 |
| commit | f7e37a7c50262e27ca8d1b439f62550f4e68e808 (patch) | |
| tree | c64c70297f7076bebb2dcad7b18231ba3996e644 /src/mac | |
| parent | aec8d4a5270c6f5f5a09d7b2275f3edc0408580f (diff) | |
| download | krb5-f7e37a7c50262e27ca8d1b439f62550f4e68e808.tar.gz krb5-f7e37a7c50262e27ca8d1b439f62550f4e68e808.tar.xz krb5-f7e37a7c50262e27ca8d1b439f62550f4e68e808.zip | |
* kconfig.c (main): Move krb5_init_context earlier in order to
initialize kcontext before use.
This allows for more graceful handling of scenario where krb5.ini is
missing - we now get an error box.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9997 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/mac')
| -rw-r--r-- | src/mac/kconfig/ChangeLog | 5 | ||||
| -rw-r--r-- | src/mac/kconfig/kconfig.c | 21 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/mac/kconfig/ChangeLog b/src/mac/kconfig/ChangeLog index 522ec54ea..b1d91c4f0 100644 --- a/src/mac/kconfig/ChangeLog +++ b/src/mac/kconfig/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 3 15:14:34 1997 Ezra Peisach <epeisach@mit.edu> + + * kconfig.c (main): Move krb5_init_context earlier in order to + initialize kcontext before use. + Fri Dec 20 12:01:10 1996 Marshall Vale <mjv@mit.edu> * kconfig.c: Adjusted time-bomb date to June 1, 1997 diff --git a/src/mac/kconfig/kconfig.c b/src/mac/kconfig/kconfig.c index 0697ec59d..1b633dba1 100644 --- a/src/mac/kconfig/kconfig.c +++ b/src/mac/kconfig/kconfig.c @@ -207,6 +207,10 @@ int main (void) DateTimeRec goalTimeBomb; long currentTime, goalTimeBombInSecs; #endif +#ifdef KRB5 + krb5_error_code code; +#endif + /* * Setup @@ -244,6 +248,15 @@ int main (void) init_cornell_des(); #endif #ifdef KRB5 + code = krb5_init_context(&kcontext); + if (code) + { + doalert("Kerberos configuration file not present"); + getout(0); + } +#endif + +#ifdef KRB5 k5_init_ccache (&k5_ccache); /*strcpy(gUserName, kUNKNOWNUSERNAME);*/ #endif @@ -302,14 +315,6 @@ int main (void) } #endif -#ifdef KRB5 - krb5_init_context(&kcontext); - if (kcontext->profile == 0) - { - doalert("Kerberos configuration file not present"); - getout(0); - } -#endif /* * build the main window |