Check the error return from krb5_init_context(), and print an error

message if necessary.

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

diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index b7970b81db2f46de6beb5718ef461a85901e66c2..6babb5e555945aa74fbfae2a9ca985279b2a7123 100644 (file)
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov  8 17:21:17 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * pop_init.c (pop_init): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Tue Sep 10 14:08:36 1996  Tom Yu  <tlyu@mit.edu>
 
        * popper.M: remove ".so man1/header.doc"

diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c
index 68c14e942f82b5d8910b31ddbe46bf587c18cb7b..b5f05c6900c1073c2ab749658a20ba16ea77d189 100644 (file)
--- a/src/appl/popper/pop_init.c
+++ b/src/appl/popper/pop_init.c
@@ -293,8 +293,11 @@ authenticate(p, addr)
     krb5_ticket *ticket;
     int sock = 0;
 
-    krb5_init_context(&pop_context);
-    krb5_init_ets(pop_context);
+    retval = krb5_init_context(&pop_context);
+    if (retval) {
+           com_err("pop_authenticate", retval, "while initializing krb5");
+           exit(1);
+    }
 
     if (retval = krb5_sname_to_principal(pop_context, p->myhost, "pop", 
                                         KRB5_NT_SRV_HST, &server)) {

diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 9479f2ddac7b6442494495dd73a0925672660528..a87734fb77bc52224b6936f08a93d9af8f91414a 100644 (file)
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:25:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * sclient.c (argv): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Tue Sep 10 14:09:01 1996  Tom Yu  <tlyu@mit.edu>
 
        * sclient.M: remove ".so man1/header.doc"

diff --git a/src/appl/sample/sclient/sclient.c b/src/appl/sample/sclient/sclient.c
index 94e06766b54f2f5d797414f08b3788112f33b923..f4f57af5b3580233518fcca6982a6872d7d658d1 100644 (file)
--- a/src/appl/sample/sclient/sclient.c
+++ b/src/appl/sample/sclient/sclient.c
@@ -73,8 +73,11 @@ char *argv[];
        exit(1);
     }
 
-    krb5_init_context(& context);
-    krb5_init_ets(context);
+    retval = krb5_init_context(&context);
+    if (retval) {
+           com_err(argv[0], retval, "while initializing krb5");
+           exit(1);
+    }
 
     (void) signal(SIGPIPE, SIG_IGN);
     if (!valid_cksumtype(CKSUMTYPE_CRC32)) {

diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index b38e905777a44cc6ac94bb67fdf3956a4df5e319..ba1d2974fe11dcbe3c51b50b4de3c6e07871eb73 100644 (file)
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:24:43 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * sserver.c (main): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Tue Sep 10 14:09:19 1996  Tom Yu  <tlyu@mit.edu>
 
        * sserver.M: remove ".so man1/header.doc"

diff --git a/src/appl/sample/sserver/sserver.c b/src/appl/sample/sserver/sserver.c
index 474a31ba983c812c8c1a442b79ee6271cff886f1..78b291d36360a11c5c06c4d935828d806278e99f 100644 (file)
--- a/src/appl/sample/sserver/sserver.c
+++ b/src/appl/sample/sserver/sserver.c
@@ -89,8 +89,11 @@ main(argc, argv)
 
     progname = *argv;
 
-    krb5_init_context(&context);
-    krb5_init_ets(context);
+    retval = krb5_init_context(&context);
+    if (retval) {
+           com_err(argv[0], retval, "while initializing krb5");
+           exit(1);
+    }
 
     /* open a log connection */
     openlog("sserver", 0, LOG_DAEMON);

diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index b8bfe7cc0e52324aa70f9eb236355227052a22df..275d42bf205cf814dce4f85d6977b5d7aedacf2a 100644 (file)
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:26:10 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * sim_client.c (main): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Thu Nov  9 09:33:38 1995  Ezra Peisach  (epeisach@kangaroo.mit.edu)
 
        * sim_client.c (main): Use krb5_get_server_rcache instead of

diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index ca966c1fa0c2f2f7f1559d2d30e1005549e0c87d..9def2603ced80b01d56e8567d505c21046c4aef2 100644 (file)
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -95,8 +95,11 @@ main(argc, argv)
     krb5_auth_context    auth_context = NULL;
     krb5_replay_data     replaydata;
 
-    krb5_init_context(&context);
-    krb5_init_ets(context);
+    retval = krb5_init_context(&context);
+    if (retval) {
+           com_err(argv[0], retval, "while initializing krb5");
+           exit(1);
+    }
 
     progname = argv[0];
 

diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 0b6d2e8950bbf874d4a2d3929c5ace35d5c9b56a..58042da37f6dcb8cac6f4345d1fa5fef26205726 100644 (file)
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:26:44 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * sim_server.c (argv): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Sat Sep 16 03:41:40 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * sim_server.c (main): Free the context and auth_context before

diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 087e4e23a6c626650efa927f6fdd9dc5d293d169..551a4f36cd43f6465a8382a1ed26887b62871925 100644 (file)
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -87,8 +87,11 @@ char *argv[];
     krb5_address addr;
     krb5_ticket *ticket = NULL;
 
-    krb5_init_context(&context);
-    krb5_init_ets(context);
+    retval = krb5_init_context(&context);
+    if (retval) {
+           com_err(argv[0], retval, "while initializing krb5");
+           exit(1);
+    }
 
     /*
      * Parse command line arguments

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 4a994eb49953a901bcf34094c7cc3fda422c4094..38d231440acc8f5128bee6cd4fb17a3a2562b1e4 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:29:09 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * kerberos5.c (kerberos5_init): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Fri Nov  1 20:32:12 1996  Sam Hartman  <hartmans@mit.edu>
 
        * parsetos.c (proto;): Add parsetos support on all platforms which

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index dbf69cef8387ba6287112f3617d4186a77ef0bec..53d3816622108f22e54dd7465ea23bc38b251322 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -165,13 +165,17 @@ kerberos5_init(ap, server)
        Authenticator *ap;
        int server;
 {
+       krb5_error_code retval;
+       
        if (server)
                str_data[3] = TELQUAL_REPLY;
        else
                str_data[3] = TELQUAL_IS;
-       if (telnet_context == 0)
-           krb5_init_context(&telnet_context);
-        krb5_init_ets(telnet_context);
+       if (telnet_context == 0) {
+               retval = krb5_init_context(&telnet_context);
+               if (retval)
+                       return 0;
+       }
        return(1);
 }
 

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index f78f53f25801c38f59d7d89f1c4071b1dbee7d8d..f537d119e7dca1cd88a04c3dd597c3efe10f78ef 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:32:06 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * telnetd.c (main): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Mon Oct 14 01:55:41 1996  Sam Hartman  <hartmans@mit.edu>
 
        * utility.c (printsub): Patch from jhawk@bbnplannet.com to deal

diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index ff2a63a8452072f3402356b96f098868bb21fed6..0c61712973b8d957157eacaba39e9b3dcac5b650 100644 (file)
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -360,9 +360,16 @@ main(argc, argv)
                case 'R':
                    {
                        extern krb5_context telnet_context;
+                       krb5_error_code retval;
                        
-                       if (telnet_context == 0)
-                           krb5_init_context(&telnet_context);
+                       if (telnet_context == 0) {
+                               retval = krb5_init_context(&telnet_context);
+                               if (retval) {
+                                       com_err("telnetd", retval,
+                                               "while initializing krb5");
+                                       exit(1);
+                               }
+                       }
                        krb5_set_default_realm(telnet_context, optarg);
                        break;
                    }

diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 19cddfb99a5d7906ef88856e23ba2b04e9546e49..62651d0cbc662b866c99837a0c703d70f3dbd8a4 100644 (file)
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov  7 15:36:15 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * client.c (argv): 
+       * server.c (argv): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Fri Mar 15 21:39:25 1996  Ezra Peisach  (epeisach@kangaroo.mit.edu)
 
        * server.c: Remove declaration of krb5_kdc_default_options.

diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c
index f8345a8a9a8c8e6d12bd321329c698b8040a3357..4bee7089cdf88915c714b799e22a53b06f225178 100644 (file)
--- a/src/appl/user_user/client.c
+++ b/src/appl/user_user/client.c
@@ -61,8 +61,11 @@ char *argv[];
       return 1;
     }
 
-  krb5_init_context(&context);
-  krb5_init_ets(context);
+  retval = krb5_init_context(&context);
+  if (retval) {
+         com_err(argv[0], retval, "while initializing krb5");
+         exit(1);
+  }
 
   if (argc == 4)
     {

diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index 6b3bcd6336b10c1cf4f4fdf3e14da37c2a1cc7a1..d6fb4fca9b6e9e4a399f86194fcb313b08156d1e 100644 (file)
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -55,8 +55,11 @@ char *argv[];
   freopen("/tmp/uu-server.log", "w", stderr);
 #endif
 
-  krb5_init_context(&context);
-  krb5_init_ets(context);
+  retval = krb5_init_context(&context);
+  if (retval) {
+         com_err(argv[0], retval, "while initializing krb5");
+         exit(1);
+  }
 
 #ifdef DEBUG
     {

diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 7ed995d38a0512994e3a019ca7c3c0062771b96b..3cef83af4ff71fb05012b555b9a7c8b70245983b 100644 (file)
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:41:19 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * main.c (main): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Wed Sep 18 15:54:41 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * krb_auth_su.c (krb5_get_tkt_via_passwd): Remove call to

diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
index 0b28903ce4f2850a13e48c1999fe5f5b4280f6af..8988c966a2081810b5092e5f53b837693a606293 100644 (file)
--- a/src/clients/ksu/main.c
+++ b/src/clients/ksu/main.c
@@ -127,7 +127,12 @@ char * dir_of_cc_source;
     params[1] = NULL;
 
 
-    krb5_init_context(&ksu_context); 
+    retval = krb5_init_context(&ksu_context);
+    if (retval) {
+        com_err(argv[0], retval, "while initializing krb5");
+       exit(1);
+    }
+
     krb5_init_ets(ksu_context);        /* initialize kerberos error tables */
     krb5_secure_config_files(ksu_context);
 

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 30b6966c1f1bfa3f64f4d4b9123e1c9a9bcc0e7e..afc6cfa2d53cab78cbc2743eb404bba50831f5c6 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:42:17 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * ktutil.c (main): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Tue Sep 10 14:17:17 1996  Tom Yu  <tlyu@mit.edu>
 
        * ktutil.M: remove ".so man1/header.doc"

diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index e03764e901c1fd0445bea8b4bf020bee16079aa1..e74ab117cb0017dc24740ce3a933d243a69119b6 100644 (file)
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -45,8 +45,11 @@ int main(argc, argv)
     extern krb5_kt_ops krb5_ktf_writable_ops;
     int sci_idx;
 
-    krb5_init_context(&kcontext);
-    krb5_init_ets(kcontext);
+    retval = krb5_init_context(&kcontext);
+    if (retval) {
+        com_err(argv[0], retval, "while initializing krb5");
+       exit(1);
+    }
     retval = krb5_kt_register(kcontext, &krb5_ktf_writable_ops);
     if (retval) {
        com_err(argv[0], retval,

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index f83cf3cccbdc9301983860f3feabc80384d48ad1..77006b22e6b99e008e6f7829e7524d8a7950b5c7 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov  8 17:27:20 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * admin_server.c (argv): Check the error return from
+               krb5_init_context(), and print an error message if
+               necessary.
+
 Mon Oct 21 17:20:32 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * admin_server.c: use params.admin_keytab instead of a hard-coded

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index fb6ff7d05611f299ae7080a30e5b1484cafe9462..0abc7d822290a647e047bb7e4924ffbb26ffeb58 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -95,13 +95,17 @@ char *argv[];
     char *lrealm;
     extern char *optarg;
     extern int fascist_cpw;
-
+    krb5_error_code retval;
+    
 #ifdef OVSEC_KADM
     memset(&params, 0, sizeof(params));
 #endif
 
-    krb5_init_context(&kadm_context);
-    krb5_init_ets(kadm_context);
+    retval = krb5_init_context(&kadm_context);
+    if (retval) {
+        com_err(argv[0], retval, "while initializing krb5");
+       exit(1);
+    }
     initialize_kadm_error_table();
     prog[sizeof(prog)-1]='\0';         /* Terminate... */
     (void) strncpy(prog, argv[0], sizeof(prog)-1);

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 03380e69279be8c3cc90b5756b6b5585314f61c0..60673e1dc34bf7c00bc2f53020e70f15eccd16dd 100644 (file)
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  7 15:18:01 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * kprop.c (main): 
+       * kpropd.c (PRS): Check the error return from krb5_init_context(),
+               and print an error message if necessary.
+
 Tue Oct 22 16:42:37 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * kpropd.c (PRS): munge realm of sname_to_princ when -r is

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 742bf7ace3175747ec553b55d1f6278d1593c1a7..3c4848135af47fa85eed212cb886a1ca66e8c67a 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -104,8 +104,11 @@ main(argc, argv)
        krb5_auth_context auth_context;
        char    Errmsg[256];
        
-       krb5_init_context(&context);
-       krb5_init_ets(context);
+       retval = krb5_init_context(&context);
+       if (retval) {
+               com_err(argv[0], retval, "while initializing krb5");
+               exit(1);
+       }
        PRS(argc, argv);
        get_tickets(context);
 

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index ab214db114adc92bdb0a4e3db14e573a81abb8c6..7139a25c24628c5f21dc03ef9726a06f43a5e147 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -365,8 +365,11 @@ void PRS(argv)
        krb5_error_code retval;
        static const char       tmp[] = ".temp";
        
-       krb5_init_context(&kpropd_context);
-       krb5_init_ets(kpropd_context);
+       retval = krb5_init_context(&kpropd_context);
+       if (retval) {
+               com_err(argv[0], retval, "while initializing krb5");
+               exit(1);
+       }
 
        progname = *argv++;
        while (word = *argv++) {