* 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

diff --git a/src/mac/kconfig/ChangeLog b/src/mac/kconfig/ChangeLog
index 522ec54ea7a2d0e40d9ebcbff78946d0c74ef30f..b1d91c4f09a92b6780320f497c2f459509bfb048 100644 (file)
--- 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 0697ec59dd291f0f751709d3b1379bff084b519d..1b633dba1c36fcb5fd00f23689595fac5460c052 100644 (file)
--- 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
@@ -243,6 +247,15 @@ int main (void)
 #ifdef KRB4
        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);*/
@@ -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