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

17 files changed, 100 insertions, 19 deletions

diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index b7970b81db..6babb5e555 100644
--- 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 68c14e942f..b5f05c6900 100644
--- 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 9479f2ddac..a87734fb77 100644
--- 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 94e06766b5..f4f57af5b3 100644
--- 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 b38e905777..ba1d2974fe 100644
--- 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 474a31ba98..78b291d363 100644
--- 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 b8bfe7cc0e..275d42bf20 100644
--- 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 ca966c1fa0..9def2603ce 100644
--- 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 0b6d2e8950..58042da37f 100644
--- 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 087e4e23a6..551a4f36cd 100644
--- 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 4a994eb499..38d231440a 100644
--- 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 dbf69cef83..53d3816622 100644
--- 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 f78f53f258..f537d119e7 100644
--- 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 ff2a63a845..0c61712973 100644
--- 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 19cddfb99a..62651d0cbc 100644
--- 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 f8345a8a9a..4bee7089cd 100644
--- 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 6b3bcd6336..d6fb4fca9b 100644
--- 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
     {